From commits-return-5057-apmail-drill-commits-archive=drill.apache.org@drill.apache.org Tue Aug 8 00:31:41 2017 Return-Path: X-Original-To: apmail-drill-commits-archive@www.apache.org Delivered-To: apmail-drill-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B8D031AA58 for ; Tue, 8 Aug 2017 00:31:41 +0000 (UTC) Received: (qmail 32017 invoked by uid 500); 8 Aug 2017 00:31:41 -0000 Delivered-To: apmail-drill-commits-archive@drill.apache.org Received: (qmail 31970 invoked by uid 500); 8 Aug 2017 00:31:41 -0000 Mailing-List: contact commits-help@drill.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: commits@drill.apache.org Delivered-To: mailing list commits@drill.apache.org Received: (qmail 31961 invoked by uid 99); 8 Aug 2017 00:31:41 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Aug 2017 00:31:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 59BA5DFA3C; Tue, 8 Aug 2017 00:31:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: progers@apache.org To: commits@drill.apache.org Date: Tue, 08 Aug 2017 00:31:40 -0000 Message-Id: <9f5bc187efa04c1badf8201c74a8b8b2@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/3] drill git commit: DRILL-5686: Warning for sasl.max_wrapped_size contain incorrect syntax DRILL-5686: Warning for sasl.max_wrapped_size contain incorrect syntax closes #884 Project: http://git-wip-us.apache.org/repos/asf/drill/repo Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/5bb4b1f6 Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/5bb4b1f6 Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/5bb4b1f6 Branch: refs/heads/master Commit: 5bb4b1f661edc7281245d2d2ceed8d339e75d702 Parents: 75b2136 Author: Sorabh Hamirwasia Authored: Mon Jul 24 19:06:21 2017 -0700 Committer: Paul Rogers Committed: Mon Aug 7 14:46:28 2017 -0700 ---------------------------------------------------------------------- .../java/org/apache/drill/exec/rpc/BitConnectionConfig.java | 5 +++-- .../org/apache/drill/exec/rpc/user/UserConnectionConfig.java | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/drill/blob/5bb4b1f6/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/BitConnectionConfig.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/BitConnectionConfig.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/BitConnectionConfig.java index 7d9ebec..4f49993 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/BitConnectionConfig.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/BitConnectionConfig.java @@ -68,8 +68,9 @@ public abstract class BitConnectionConfig extends AbstractConnectionConfig { "bit.encryption.sasl.max_wrapped_size. Must be a positive integer in bytes with a recommended max value " + "of %s", RpcConstants.MAX_RECOMMENDED_WRAPPED_SIZE)); } else if (maxWrappedSize > RpcConstants.MAX_RECOMMENDED_WRAPPED_SIZE) { - logger.warn("The configured value of bit.encryption.sasl.max_wrapped_size is too big. This may cause higher" + - " memory pressure. [Details: Recommended max value is %s]", RpcConstants.MAX_RECOMMENDED_WRAPPED_SIZE); + logger.warn("The configured value of bit.encryption.sasl.max_wrapped_size: {} is too big. This may cause " + + "higher memory pressure. [Details: Recommended max value is {}]", + maxWrappedSize, RpcConstants.MAX_RECOMMENDED_WRAPPED_SIZE); } encryptionContext.setMaxWrappedSize(maxWrappedSize); http://git-wip-us.apache.org/repos/asf/drill/blob/5bb4b1f6/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserConnectionConfig.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserConnectionConfig.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserConnectionConfig.java index 64ac6be..57ad4d5 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserConnectionConfig.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserConnectionConfig.java @@ -61,8 +61,9 @@ class UserConnectionConfig extends AbstractConnectionConfig { "user.encryption.sasl.max_wrapped_size. Must be a positive integer in bytes with a recommended max value " + "of %s", RpcConstants.MAX_RECOMMENDED_WRAPPED_SIZE)); } else if (maxWrappedSize > RpcConstants.MAX_RECOMMENDED_WRAPPED_SIZE) { - logger.warn("The configured value of user.encryption.sasl.max_wrapped_size is too big. This may cause higher" + - " memory pressure. [Details: Recommended max value is %s]", RpcConstants.MAX_RECOMMENDED_WRAPPED_SIZE); + logger.warn("The configured value of user.encryption.sasl.max_wrapped_size: {} is too big. This may cause " + + "higher memory pressure. [Details: Recommended max value is {}]", + maxWrappedSize, RpcConstants.MAX_RECOMMENDED_WRAPPED_SIZE); } encryptionContext.setMaxWrappedSize(maxWrappedSize);