You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by bl...@apache.org on 2020/04/07 08:32:50 UTC

[cassandra] branch trunk updated: Fix nodetool describering output

This is an automated email from the ASF dual-hosted git repository.

blerer pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 007a935  Fix nodetool describering output
007a935 is described below

commit 007a9357cff44bfb1493ce37fe8a74b6697934bb
Author: Stefan Miklosovic <st...@instaclustr.com>
AuthorDate: Mon Apr 6 16:49:52 2020 +0200

    Fix nodetool describering output
    
    patch by Stefan Miklosovic; reviewed by T Jake Luciani for CASSANDRA-15682
---
 CHANGES.txt                                           |  1 +
 src/java/org/apache/cassandra/service/TokenRange.java | 16 ++++------------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 95a6802..2b7f7c5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 4.0-alpha4
+ * Fix nodetool describering output (CASSANDRA-15682)
  * Only track ideal CL failure when request CL met (CASSANDRA-15696)
  * Fix flaky CoordinatorMessagingTest and docstring in OutboundSink and ConsistentSession (CASSANDRA-15672)
  * Fix force compaction of wrapping ranges (CASSANDRA-15664)
diff --git a/src/java/org/apache/cassandra/service/TokenRange.java b/src/java/org/apache/cassandra/service/TokenRange.java
index a1f9aee..37971f5 100644
--- a/src/java/org/apache/cassandra/service/TokenRange.java
+++ b/src/java/org/apache/cassandra/service/TokenRange.java
@@ -89,18 +89,10 @@ public class TokenRange
             endpointDetails.add(ep.toString(withPorts));
         }
 
-        if (withPorts)
-        {
-            sb.append(", endpoints:").append(hosts);
-            sb.append(", rpc_endpoints:").append(rpcs);
-            sb.append(", endpoint_details:").append(endpointDetails);
-        }
-        else
-        {
-            sb.append("endpoints:").append(hosts);
-            sb.append("rpc_endpoints:").append(rpcs);
-            sb.append("endpoint_details:").append(endpointDetails);
-        }
+        sb.append(", endpoints:").append(hosts);
+        sb.append(", rpc_endpoints:").append(rpcs);
+        sb.append(", endpoint_details:").append(endpointDetails);
+
         sb.append(")");
         return sb.toString();
     }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org