Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-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 C772618A5C for ; Thu, 24 Sep 2015 21:49:46 +0000 (UTC) Received: (qmail 62976 invoked by uid 500); 24 Sep 2015 21:49:46 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 62812 invoked by uid 500); 24 Sep 2015 21:49:46 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 62654 invoked by uid 99); 24 Sep 2015 21:49:46 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Sep 2015 21:49:46 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 20143E099B; Thu, 24 Sep 2015 21:49:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jmckenzie@apache.org To: commits@cassandra.apache.org Date: Thu, 24 Sep 2015 21:49:50 -0000 Message-Id: <91c73bcb51184a38a8ea42ec077a7e5e@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [06/12] cassandra git commit: Fix DC and Rack in nodetool info Fix DC and Rack in nodetool info Patch by Carl Yeksigian; reviewed by stefania for CASSANDRA-10382 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6039d0ef Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6039d0ef Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6039d0ef Branch: refs/heads/trunk Commit: 6039d0ef74a1d4c3333a699626302596d621ab04 Parents: 0c1432a Author: Carl Yeksigian Authored: Thu Sep 24 14:43:44 2015 -0700 Committer: Joshua McKenzie Committed: Thu Sep 24 14:43:44 2015 -0700 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/StorageService.java | 10 +++++++++- .../org/apache/cassandra/service/StorageServiceMBean.java | 5 ++++- src/java/org/apache/cassandra/tools/NodeProbe.java | 4 ++-- 3 files changed, 15 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6039d0ef/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java index ffe219e..8a2e71e 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -1416,7 +1416,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE return getTokenMetadata().getHostId(FBUtilities.getBroadcastAddress()).toString(); } - public Map getHostIdMap() + public Map getEndpointToHostId() { Map mapOut = new HashMap<>(); for (Map.Entry entry : getTokenMetadata().getEndpointToHostIdMapForReading().entrySet()) @@ -1424,6 +1424,14 @@ public class StorageService extends NotificationBroadcasterSupport implements IE return mapOut; } + public Map getHostIdToEndpoint() + { + Map mapOut = new HashMap<>(); + for (Map.Entry entry : getTokenMetadata().getEndpointToHostIdMapForReading().entrySet()) + mapOut.put(entry.getValue().toString(), entry.getKey().getHostAddress()); + return mapOut; + } + /** * Construct the range to endpoint mapping based on the true view * of the world. http://git-wip-us.apache.org/repos/asf/cassandra/blob/6039d0ef/src/java/org/apache/cassandra/service/StorageServiceMBean.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/StorageServiceMBean.java b/src/java/org/apache/cassandra/service/StorageServiceMBean.java index 1f86d82..7e74947 100644 --- a/src/java/org/apache/cassandra/service/StorageServiceMBean.java +++ b/src/java/org/apache/cassandra/service/StorageServiceMBean.java @@ -159,7 +159,10 @@ public interface StorageServiceMBean extends NotificationEmitter public String getLocalHostId(); /** Retrieve the mapping of endpoint to host ID */ - public Map getHostIdMap(); + public Map getEndpointToHostId(); + + /** Retrieve the mapping of host ID to endpoint */ + public Map getHostIdToEndpoint(); /** * Numeric load value. http://git-wip-us.apache.org/repos/asf/cassandra/blob/6039d0ef/src/java/org/apache/cassandra/tools/NodeProbe.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/NodeProbe.java b/src/java/org/apache/cassandra/tools/NodeProbe.java index caa12c3..6f2b6fb 100644 --- a/src/java/org/apache/cassandra/tools/NodeProbe.java +++ b/src/java/org/apache/cassandra/tools/NodeProbe.java @@ -502,7 +502,7 @@ public class NodeProbe implements AutoCloseable public Map getHostIdMap() { - return ssProxy.getHostIdMap(); + return ssProxy.getEndpointToHostId(); } public String getLoadString() @@ -807,7 +807,7 @@ public class NodeProbe implements AutoCloseable public String getEndpoint() { - Map hostIdToEndpoint = ssProxy.getHostIdMap(); + Map hostIdToEndpoint = ssProxy.getHostIdToEndpoint(); return hostIdToEndpoint.get(ssProxy.getLocalHostId()); }