Return-Path: X-Original-To: apmail-qpid-commits-archive@www.apache.org Delivered-To: apmail-qpid-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 EBE9018A7E for ; Fri, 22 Jan 2016 16:10:06 +0000 (UTC) Received: (qmail 31553 invoked by uid 500); 22 Jan 2016 16:10:06 -0000 Delivered-To: apmail-qpid-commits-archive@qpid.apache.org Received: (qmail 31525 invoked by uid 500); 22 Jan 2016 16:10:06 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 31516 invoked by uid 99); 22 Jan 2016 16:10:06 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Jan 2016 16:10:06 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 70115C0087 for ; Fri, 22 Jan 2016 16:10:06 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.799 X-Spam-Level: * X-Spam-Status: No, score=1.799 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id tBa4jTLwGR_U for ; Fri, 22 Jan 2016 16:10:05 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with ESMTP id C9B1F43F6E for ; Fri, 22 Jan 2016 16:10:04 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 4BF63E0185 for ; Fri, 22 Jan 2016 16:10:04 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 27C383A023C for ; Fri, 22 Jan 2016 16:10:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1726249 - in /qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb: EnvironmentFacade.java EnvironmentUtils.java StandardEnvironmentFacade.java replication/ReplicatedEnvironmentFacade.java Date: Fri, 22 Jan 2016 16:10:04 -0000 To: commits@qpid.apache.org From: rgodfrey@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160122161004.27C383A023C@svn01-us-west.apache.org> Author: rgodfrey Date: Fri Jan 22 16:10:03 2016 New Revision: 1726249 URL: http://svn.apache.org/viewvc?rev=1726249&view=rev Log: QPID-7006 , QPID-7007 : Update based on [~kwall]s review comments Modified: qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/EnvironmentFacade.java qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/EnvironmentUtils.java qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacade.java qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java Modified: qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/EnvironmentFacade.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/EnvironmentFacade.java?rev=1726249&r1=1726248&r2=1726249&view=diff ============================================================================== --- qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/EnvironmentFacade.java (original) +++ qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/EnvironmentFacade.java Fri Jan 22 16:10:03 2016 @@ -44,6 +44,8 @@ public interface EnvironmentFacade put(EnvironmentConfig.LOCK_N_LOCK_TABLES, "7"); // Turn off stats generation - feature introduced (and on by default) from BDB JE 5.0.84 put(EnvironmentConfig.STATS_COLLECT, "false"); + put(EnvironmentConfig.FILE_LOGGING_LEVEL, "OFF"); + put(EnvironmentConfig.CONSOLE_LOGGING_LEVEL, "OFF"); put(EnvironmentConfig.CLEANER_UPGRADE_TO_LOG_VERSION, "-1"); // Automatic cleaner adjustment has been seen to stop the cleaner working at all, disable it // Newer versions of BDB JE 6.3 ignore this setting. Modified: qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/EnvironmentUtils.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/EnvironmentUtils.java?rev=1726249&r1=1726248&r2=1726249&view=diff ============================================================================== --- qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/EnvironmentUtils.java (original) +++ qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/EnvironmentUtils.java Fri Jan 22 16:10:03 2016 @@ -192,18 +192,18 @@ final public class EnvironmentUtils if(!currentlySetInEnv || !contextValue.equals(mutableConfig.getConfigParam(paramName))) { mutableConfig.setConfigParam(paramName, contextValue); - LOGGER.debug("Setting BDB configuration parameter '%1' to value '%2'.", param, contextValue); + LOGGER.debug("Setting BDB configuration parameter '{}' to value '{}'.", param, contextValue); } } else if(currentlySetInEnv && !paramsSetByDefault.contains(paramName)) { mutableConfig.setConfigParam(paramName, param.getDefault()); - LOGGER.debug("Setting BDB configuration parameter '%1' to its default value.", param); + LOGGER.debug("Setting BDB configuration parameter '{}' to its default value.", param); } } catch (IllegalArgumentException e) { - LOGGER.warn("Unable to set BDB configuration parameter '%1' to value '%2'.", param, contextValue, e); + LOGGER.warn("Unable to set BDB configuration parameter '{}' to value '{}'.", param, contextValue, e); } } Modified: qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacade.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacade.java?rev=1726249&r1=1726248&r2=1726249&view=diff ============================================================================== --- qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacade.java (original) +++ qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacade.java Fri Jan 22 16:10:03 2016 @@ -72,9 +72,7 @@ public class StandardEnvironmentFacade i static { Set excludes = new HashSet<>(ENVCONFIG_DEFAULTS.keySet()); - excludes.addAll(Arrays.asList(EnvironmentConfig.FILE_LOGGING_LEVEL, - EnvironmentConfig.CONSOLE_LOGGING_LEVEL, - EnvironmentConfig.MAX_MEMORY, + excludes.addAll(Arrays.asList(EnvironmentConfig.MAX_MEMORY, EnvironmentConfig.MAX_MEMORY_PERCENT )); PARAMS_SET_BY_DEFAULT = Collections.unmodifiableSet(excludes); @@ -105,8 +103,6 @@ public class StandardEnvironmentFacade i envConfig.setAllowCreate(true); envConfig.setTransactional(true); envConfig.setCacheMode(CacheMode.EVICT_LN); - envConfig.setConfigParam(EnvironmentConfig.FILE_LOGGING_LEVEL, "OFF"); - envConfig.setConfigParam(EnvironmentConfig.CONSOLE_LOGGING_LEVEL, "OFF"); envConfig.setLoggingHandler(new Slf4jLoggingHandler("["+configuration.getName()+"]")); Map params = new HashMap<>(EnvironmentFacade.ENVCONFIG_DEFAULTS); Modified: qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java?rev=1726249&r1=1726248&r2=1726249&view=diff ============================================================================== --- qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java (original) +++ qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java Fri Jan 22 16:10:03 2016 @@ -176,9 +176,7 @@ public class ReplicatedEnvironmentFacade excludes.addAll(REPCONFIG_DEFAULTS.keySet()); - excludes.addAll(Arrays.asList(EnvironmentConfig.FILE_LOGGING_LEVEL, - EnvironmentConfig.CONSOLE_LOGGING_LEVEL, - EnvironmentConfig.MAX_MEMORY, + excludes.addAll(Arrays.asList(EnvironmentConfig.MAX_MEMORY, EnvironmentConfig.MAX_MEMORY_PERCENT )); PARAMS_SET_BY_DEFAULT = Collections.unmodifiableSet(excludes); @@ -1525,8 +1523,6 @@ public class ReplicatedEnvironmentFacade envConfig.setExceptionListener(new ExceptionListener()); envConfig.setDurability(_defaultDurability); envConfig.setCacheMode(CacheMode.EVICT_LN); - envConfig.setConfigParam(EnvironmentConfig.FILE_LOGGING_LEVEL, "OFF"); - envConfig.setConfigParam(EnvironmentConfig.CONSOLE_LOGGING_LEVEL, "OFF"); envConfig.setLoggingHandler(new Slf4jLoggingHandler("[" + _configuration.getName() + "]")); for (Map.Entry configItem : environmentParameters.entrySet()) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org For additional commands, e-mail: commits-help@qpid.apache.org