You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ph...@apache.org on 2018/01/19 00:12:35 UTC
zookeeper git commit: ZOOKEEPER-2964: Conf" command returns dataDir
and dataLogDir opposingly
Repository: zookeeper
Updated Branches:
refs/heads/master 77d6b763a -> 78708a858
ZOOKEEPER-2964: Conf" command returns dataDir and dataLogDir opposingly
See [https://issues.apache.org/jira/browse/ZOOKEEPER-2964](url) for details.
The bug affects versions newer than 3.5. According to Andor Molnar‘s [review](https://issues.apache.org/jira/browse/ZOOKEEPER-2964?focusedCommentId=16330018&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-16330018) this patch can be applied to master and branch-3.5 branches.
Thanks all for reviewing this issue.
Author: Qihong Xu <qi...@bu.edu>
Reviewers: phunt@apache.org
Closes #449 from qihongxu/ZOOKEEPER-2964
Change-Id: Ie7de251afd5cca64f4735d75d9c95a886ff75328
Project: http://git-wip-us.apache.org/repos/asf/zookeeper/repo
Commit: http://git-wip-us.apache.org/repos/asf/zookeeper/commit/78708a85
Tree: http://git-wip-us.apache.org/repos/asf/zookeeper/tree/78708a85
Diff: http://git-wip-us.apache.org/repos/asf/zookeeper/diff/78708a85
Branch: refs/heads/master
Commit: 78708a8587841ccdcb3d07f33d3114e0c8cfc380
Parents: 77d6b76
Author: Qihong Xu <qi...@bu.edu>
Authored: Thu Jan 18 16:12:03 2018 -0800
Committer: Patrick Hunt <ph...@apache.org>
Committed: Thu Jan 18 16:12:03 2018 -0800
----------------------------------------------------------------------
src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/78708a85/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java
----------------------------------------------------------------------
diff --git a/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java b/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java
index 3ac1ddd..c8cd72d 100644
--- a/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java
+++ b/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java
@@ -185,11 +185,11 @@ public class ZooKeeperServer implements SessionExpirer, ServerStats.Provider {
pwriter.print("secureClientPort=");
pwriter.println(getSecureClientPort());
pwriter.print("dataDir=");
- pwriter.println(zkDb.snapLog.getDataDir().getAbsolutePath());
+ pwriter.println(zkDb.snapLog.getSnapDir().getAbsolutePath());
pwriter.print("dataDirSize=");
pwriter.println(getDataDirSize());
pwriter.print("dataLogDir=");
- pwriter.println(zkDb.snapLog.getSnapDir().getAbsolutePath());
+ pwriter.println(zkDb.snapLog.getDataDir().getAbsolutePath());
pwriter.print("dataLogSize=");
pwriter.println(getLogDirSize());
pwriter.print("tickTime=");