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 4F540188C4 for ; Fri, 28 Aug 2015 14:02:14 +0000 (UTC) Received: (qmail 64504 invoked by uid 500); 28 Aug 2015 14:02:14 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 64469 invoked by uid 500); 28 Aug 2015 14:02:14 -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 64457 invoked by uid 99); 28 Aug 2015 14:02:14 -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; Fri, 28 Aug 2015 14:02:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id F192CDFE14; Fri, 28 Aug 2015 14:02:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: blerer@apache.org To: commits@cassandra.apache.org Message-Id: <632e9122ea63403580272960d3fb08b7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cassandra git commit: consistently sort DCs in nodetool:status Date: Fri, 28 Aug 2015 14:02:13 +0000 (UTC) Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 7e1ea4c8c -> 264cf3647 consistently sort DCs in nodetool:status patch by Chris Burroughs; reviewed by Paulo Motta for CASSANDRA-10131 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/264cf364 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/264cf364 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/264cf364 Branch: refs/heads/cassandra-2.1 Commit: 264cf3647b33109e44babc0aa397ee7b492265ed Parents: 7e1ea4c Author: Chris Burroughs Authored: Fri Aug 28 16:01:10 2015 +0200 Committer: blerer Committed: Fri Aug 28 16:01:10 2015 +0200 ---------------------------------------------------------------------- src/java/org/apache/cassandra/tools/NodeTool.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/264cf364/src/java/org/apache/cassandra/tools/NodeTool.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/NodeTool.java b/src/java/org/apache/cassandra/tools/NodeTool.java index 6a7a930..8e88f45 100644 --- a/src/java/org/apache/cassandra/tools/NodeTool.java +++ b/src/java/org/apache/cassandra/tools/NodeTool.java @@ -66,6 +66,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Scanner; import java.util.Set; +import java.util.SortedMap; import java.util.concurrent.ExecutionException; import javax.management.InstanceNotFoundException; @@ -2156,7 +2157,7 @@ public class NodeTool System.exit(1); } - Map dcs = getOwnershipByDc(probe, resolveIp, tokensToEndpoints, ownerships); + SortedMap dcs = getOwnershipByDc(probe, resolveIp, tokensToEndpoints, ownerships); // More tokens than nodes (aka vnodes)? if (dcs.values().size() < tokensToEndpoints.keySet().size()) @@ -2277,11 +2278,11 @@ public class NodeTool } } - private static Map getOwnershipByDc(NodeProbe probe, boolean resolveIp, - Map tokenToEndpoint, - Map ownerships) + private static SortedMap getOwnershipByDc(NodeProbe probe, boolean resolveIp, + Map tokenToEndpoint, + Map ownerships) { - Map ownershipByDc = Maps.newLinkedHashMap(); + SortedMap ownershipByDc = Maps.newTreeMap(); EndpointSnitchInfoMBean epSnitchInfo = probe.getEndpointSnitchInfoProxy(); try {