zookeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ph...@apache.org
Subject zookeeper git commit: ZOOKEEPER-2964: Conf" command returns dataDir and dataLogDir opposingly
Date Fri, 19 Jan 2018 00:13:28 GMT
Repository: zookeeper
Updated Branches:
  refs/heads/branch-3.5 245d2333f -> 67b6767c0


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 <qihongxu@bu.edu>

Reviewers: phunt@apache.org

Closes #449 from qihongxu/ZOOKEEPER-2964

Change-Id: Ie7de251afd5cca64f4735d75d9c95a886ff75328
(cherry picked from commit 78708a8587841ccdcb3d07f33d3114e0c8cfc380)
Signed-off-by: Patrick Hunt <phunt@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/zookeeper/repo
Commit: http://git-wip-us.apache.org/repos/asf/zookeeper/commit/67b6767c
Tree: http://git-wip-us.apache.org/repos/asf/zookeeper/tree/67b6767c
Diff: http://git-wip-us.apache.org/repos/asf/zookeeper/diff/67b6767c

Branch: refs/heads/branch-3.5
Commit: 67b6767c0f1f10d4c1262bcb23cb33f72ad1ae37
Parents: 245d233
Author: Qihong Xu <qihongxu@bu.edu>
Authored: Thu Jan 18 16:12:03 2018 -0800
Committer: Patrick Hunt <phunt@apache.org>
Committed: Thu Jan 18 16:12:40 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/67b6767c/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 c9789a4..5a8610e 100644
--- a/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java
+++ b/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java
@@ -184,11 +184,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=");


Mime
View raw message