ACCUMULO-3887 Hex-encode the session ID in the client.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/884165d2
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/884165d2
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/884165d2
Branch: refs/heads/master
Commit: 884165d283952877d55e98e0d0c90fd1f1adcadd
Parents: e04ea77
Author: Josh Elser <elserj@apache.org>
Authored: Thu Jun 4 18:02:14 2015 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Thu Jun 4 18:02:14 2015 -0400
----------------------------------------------------------------------
.../base/src/main/java/org/apache/accumulo/server/util/Admin.java | 2 +-
.../test/java/org/apache/accumulo/test/functional/ShutdownIT.java | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/884165d2/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java b/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java
index c7f9739..3c4a05a 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java
@@ -411,7 +411,7 @@ public class Admin implements KeywordExecutable {
if (0 == sessionId) {
return hostAndPort;
}
- return hostAndPort + "[" + sessionId + "]";
+ return hostAndPort + "[" + Long.toHexString(sessionId) + "]";
} catch (InterruptedException | KeeperException e) {
log.warn("Failed to communicate with ZooKeeper to find session ID for TabletServer.");
return hostAndPort;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/884165d2/test/src/test/java/org/apache/accumulo/test/functional/ShutdownIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ShutdownIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ShutdownIT.java
index c3042d7..ac38f19 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/ShutdownIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/ShutdownIT.java
@@ -112,6 +112,7 @@ public class ShutdownIT extends ConfigurableMacIT {
List<String> tabletServers = c.instanceOperations().getTabletServers();
assertEquals(2, tabletServers.size());
String doomed = tabletServers.get(0);
+ log.info("Stopping " + doomed);
assertEquals(0, cluster.exec(Admin.class, "stop", doomed).waitFor());
tabletServers = c.instanceOperations().getTabletServers();
assertEquals(1, tabletServers.size());
|