Author: phunt
Date: Sun Mar 20 18:34:57 2016
New Revision: 1735893
URL: http://svn.apache.org/viewvc?rev=1735893&view=rev
Log:
ZOOKEEPER-2195 fsync.warningthresholdms in zoo.cfg not working (Biju Nair via phunt)
Modified:
zookeeper/branches/branch-3.5/CHANGES.txt
zookeeper/branches/branch-3.5/docs/index.pdf
zookeeper/branches/branch-3.5/docs/javaExample.pdf
zookeeper/branches/branch-3.5/docs/linkmap.pdf
zookeeper/branches/branch-3.5/docs/recipes.pdf
zookeeper/branches/branch-3.5/docs/zookeeperAdmin.html
zookeeper/branches/branch-3.5/docs/zookeeperAdmin.pdf
zookeeper/branches/branch-3.5/docs/zookeeperHierarchicalQuorums.pdf
zookeeper/branches/branch-3.5/docs/zookeeperInternals.pdf
zookeeper/branches/branch-3.5/docs/zookeeperJMX.pdf
zookeeper/branches/branch-3.5/docs/zookeeperObservers.pdf
zookeeper/branches/branch-3.5/docs/zookeeperOver.pdf
zookeeper/branches/branch-3.5/docs/zookeeperProgrammers.pdf
zookeeper/branches/branch-3.5/docs/zookeeperQuotas.pdf
zookeeper/branches/branch-3.5/docs/zookeeperReconfig.pdf
zookeeper/branches/branch-3.5/docs/zookeeperStarted.pdf
zookeeper/branches/branch-3.5/docs/zookeeperTutorial.pdf
zookeeper/branches/branch-3.5/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml
zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/persistence/FileTxnLog.java
Modified: zookeeper/branches/branch-3.5/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/CHANGES.txt?rev=1735893&r1=1735892&r2=1735893&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.5/CHANGES.txt Sun Mar 20 18:34:57 2016
@@ -139,6 +139,9 @@ BUGFIXES:
ZOOKEEPER-2393: Revert run-time dependency on log4j and slf4j-log4j12
(Arshad Mohammad via cnauroth)
+ ZOOKEEPER-2195 fsync.warningthresholdms in zoo.cfg not working
+ (Biju Nair via phunt)
+
IMPROVEMENTS:
ZOOKEEPER-2270: Allow MBeanRegistry to be overridden for better unit tests
Modified: zookeeper/branches/branch-3.5/docs/index.pdf
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/index.pdf?rev=1735893&r1=1735892&r2=1735893&view=diff
==============================================================================
Binary files - no diff available.
Modified: zookeeper/branches/branch-3.5/docs/javaExample.pdf
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/javaExample.pdf?rev=1735893&r1=1735892&r2=1735893&view=diff
==============================================================================
Binary files - no diff available.
Modified: zookeeper/branches/branch-3.5/docs/linkmap.pdf
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/linkmap.pdf?rev=1735893&r1=1735892&r2=1735893&view=diff
==============================================================================
Binary files - no diff available.
Modified: zookeeper/branches/branch-3.5/docs/recipes.pdf
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/recipes.pdf?rev=1735893&r1=1735892&r2=1735893&view=diff
==============================================================================
Binary files - no diff available.
Modified: zookeeper/branches/branch-3.5/docs/zookeeperAdmin.html
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/zookeeperAdmin.html?rev=1735893&r1=1735892&r2=1735893&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/docs/zookeeperAdmin.html (original)
+++ zookeeper/branches/branch-3.5/docs/zookeeperAdmin.html Sun Mar 20 18:34:57 2016
@@ -1308,7 +1308,7 @@ server.3=zoo3:2888:3888</pre>
<term>fsync.warningthresholdms</term>
</dt>
<dd>
-<p>(Java system property: <strong>fsync.warningthresholdms</strong>)</p>
+<p>(Java system property: <strong>zookeeper.fsync.warningthresholdms</strong>)</p>
<p>
<strong>New in 3.3.4:</strong> A
warning message will be output to the log whenever an
Modified: zookeeper/branches/branch-3.5/docs/zookeeperAdmin.pdf
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/zookeeperAdmin.pdf?rev=1735893&r1=1735892&r2=1735893&view=diff
==============================================================================
Binary files - no diff available.
Modified: zookeeper/branches/branch-3.5/docs/zookeeperHierarchicalQuorums.pdf
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/zookeeperHierarchicalQuorums.pdf?rev=1735893&r1=1735892&r2=1735893&view=diff
==============================================================================
Binary files zookeeper/branches/branch-3.5/docs/zookeeperHierarchicalQuorums.pdf (original) and zookeeper/branches/branch-3.5/docs/zookeeperHierarchicalQuorums.pdf Sun Mar 20 18:34:57 2016 differ
Modified: zookeeper/branches/branch-3.5/docs/zookeeperInternals.pdf
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/zookeeperInternals.pdf?rev=1735893&r1=1735892&r2=1735893&view=diff
==============================================================================
Binary files - no diff available.
Modified: zookeeper/branches/branch-3.5/docs/zookeeperJMX.pdf
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/zookeeperJMX.pdf?rev=1735893&r1=1735892&r2=1735893&view=diff
==============================================================================
Binary files zookeeper/branches/branch-3.5/docs/zookeeperJMX.pdf (original) and zookeeper/branches/branch-3.5/docs/zookeeperJMX.pdf Sun Mar 20 18:34:57 2016 differ
Modified: zookeeper/branches/branch-3.5/docs/zookeeperObservers.pdf
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/zookeeperObservers.pdf?rev=1735893&r1=1735892&r2=1735893&view=diff
==============================================================================
Binary files zookeeper/branches/branch-3.5/docs/zookeeperObservers.pdf (original) and zookeeper/branches/branch-3.5/docs/zookeeperObservers.pdf Sun Mar 20 18:34:57 2016 differ
Modified: zookeeper/branches/branch-3.5/docs/zookeeperOver.pdf
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/zookeeperOver.pdf?rev=1735893&r1=1735892&r2=1735893&view=diff
==============================================================================
Binary files - no diff available.
Modified: zookeeper/branches/branch-3.5/docs/zookeeperProgrammers.pdf
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/zookeeperProgrammers.pdf?rev=1735893&r1=1735892&r2=1735893&view=diff
==============================================================================
Binary files - no diff available.
Modified: zookeeper/branches/branch-3.5/docs/zookeeperQuotas.pdf
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/zookeeperQuotas.pdf?rev=1735893&r1=1735892&r2=1735893&view=diff
==============================================================================
Binary files zookeeper/branches/branch-3.5/docs/zookeeperQuotas.pdf (original) and zookeeper/branches/branch-3.5/docs/zookeeperQuotas.pdf Sun Mar 20 18:34:57 2016 differ
Modified: zookeeper/branches/branch-3.5/docs/zookeeperReconfig.pdf
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/zookeeperReconfig.pdf?rev=1735893&r1=1735892&r2=1735893&view=diff
==============================================================================
Binary files - no diff available.
Modified: zookeeper/branches/branch-3.5/docs/zookeeperStarted.pdf
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/zookeeperStarted.pdf?rev=1735893&r1=1735892&r2=1735893&view=diff
==============================================================================
Binary files - no diff available.
Modified: zookeeper/branches/branch-3.5/docs/zookeeperTutorial.pdf
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/zookeeperTutorial.pdf?rev=1735893&r1=1735892&r2=1735893&view=diff
==============================================================================
Binary files - no diff available.
Modified: zookeeper/branches/branch-3.5/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml?rev=1735893&r1=1735892&r2=1735893&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml (original)
+++ zookeeper/branches/branch-3.5/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml Sun Mar 20 18:34:57 2016
@@ -901,7 +901,7 @@ server.3=zoo3:2888:3888</programlisting>
<term>fsync.warningthresholdms</term>
<listitem>
<para>(Java system property: <emphasis
- role="bold">fsync.warningthresholdms</emphasis>)</para>
+ role="bold">zookeeper.fsync.warningthresholdms</emphasis>)</para>
<para><emphasis role="bold">New in 3.3.4:</emphasis> A
warning message will be output to the log whenever an
Modified: zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/persistence/FileTxnLog.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/persistence/FileTxnLog.java?rev=1735893&r1=1735892&r2=1735893&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/persistence/FileTxnLog.java (original)
+++ zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/persistence/FileTxnLog.java Sun Mar 20 18:34:57 2016
@@ -112,7 +112,11 @@ public class FileTxnLog implements TxnLo
LOG.warn(size + " is not a valid value for preAllocSize");
}
}
- fsyncWarningThresholdMS = Long.getLong("fsync.warningthresholdms", 1000);
+ /** Local variable to read fsync.warningthresholdms into */
+ Long fsyncWarningThreshold;
+ if ((fsyncWarningThreshold = Long.getLong("zookeeper.fsync.warningthresholdms")) == null)
+ fsyncWarningThreshold = Long.getLong("fsync.warningthresholdms", 1000);
+ fsyncWarningThresholdMS = fsyncWarningThreshold;
}
long lastZxidSeen;