You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2013/09/24 17:29:59 UTC
[1/8] git commit: Avoid sending Truncate command to fat clients patch
by Oleg Anastasyev; reviewed by jbellis for CASSANDRA-6088
Updated Branches:
refs/heads/cassandra-1.2 bb3ec4ce9 -> fa8d92312
refs/heads/cassandra-2.0 326d5454d -> 424206a15
refs/heads/trunk 455e673bc -> 938e6989a
Avoid sending Truncate command to fat clients
patch by Oleg Anastasyev; reviewed by jbellis for CASSANDRA-6088
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bb3ec4ce
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bb3ec4ce
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bb3ec4ce
Branch: refs/heads/cassandra-2.0
Commit: bb3ec4ce9ec020d0bf7963517f802c2b86e9047a
Parents: 3a4d10f
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Sep 24 10:12:20 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Sep 24 10:12:20 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/gms/Gossiper.java | 20 ++++++++++++++++----
.../apache/cassandra/service/StorageProxy.java | 4 ++--
3 files changed, 19 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bb3ec4ce/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index cecb88a..ae2ab5e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
1.2.11
+ * Avoid sending Truncate command to fat clients (CASSANDRA-6088)
* Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
* Allow where clause conditions to be in parenthesis (CASSANDRA-6037)
* Do not open non-ssl storage port if encryption option is all (CASSANDRA-3916)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bb3ec4ce/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java b/src/java/org/apache/cassandra/gms/Gossiper.java
index b4ea88a..acf40f3 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -218,10 +218,22 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
public Set<InetAddress> getLiveMembers()
{
- Set<InetAddress> liveMbrs = new HashSet<InetAddress>(liveEndpoints);
- if (!liveMbrs.contains(FBUtilities.getBroadcastAddress()))
- liveMbrs.add(FBUtilities.getBroadcastAddress());
- return liveMbrs;
+ Set<InetAddress> liveMembers = new HashSet<InetAddress>(liveEndpoints);
+ if (!liveMembers.contains(FBUtilities.getBroadcastAddress()))
+ liveMembers.add(FBUtilities.getBroadcastAddress());
+ return liveMembers;
+ }
+
+ public Set<InetAddress> getLiveTokenOwners()
+ {
+ Set<InetAddress> tokenOwners = new HashSet<InetAddress>();
+ for (InetAddress member : getLiveMembers())
+ {
+ EndpointState epState = endpointStateMap.get(member);
+ if (epState != null && !isDeadState(epState) && StorageService.instance.getTokenMetadata().isMember(member))
+ tokenOwners.add(member);
+ }
+ return tokenOwners;
}
public Set<InetAddress> getUnreachableMembers()
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bb3ec4ce/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java
index be92213..8a6e52e 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -25,7 +25,6 @@ import java.nio.ByteBuffer;
import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -1551,7 +1550,8 @@ public class StorageProxy implements StorageProxyMBean
throw new UnavailableException(ConsistencyLevel.ALL, liveMembers + Gossiper.instance.getUnreachableMembers().size(), liveMembers);
}
- Set<InetAddress> allEndpoints = Gossiper.instance.getLiveMembers();
+ Set<InetAddress> allEndpoints = Gossiper.instance.getLiveTokenOwners();
+
int blockFor = allEndpoints.size();
final TruncateResponseHandler responseHandler = new TruncateResponseHandler(blockFor);
[4/8] git commit: Print a warning when using nodetool ring with
vnodes. Patch by Lyuben Todorov,
reviewed by brandonwilliams for CASSANDRA-5954
Posted by br...@apache.org.
Print a warning when using nodetool ring with vnodes.
Patch by Lyuben Todorov, reviewed by brandonwilliams for CASSANDRA-5954
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fa8d9231
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fa8d9231
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fa8d9231
Branch: refs/heads/trunk
Commit: fa8d92312e2f881fab8e58c8afc7265bd0d52bab
Parents: bb3ec4c
Author: Brandon Williams <br...@apache.org>
Authored: Tue Sep 24 10:26:04 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Sep 24 10:26:04 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/NodeCmd.java | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fa8d9231/src/java/org/apache/cassandra/tools/NodeCmd.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/NodeCmd.java b/src/java/org/apache/cassandra/tools/NodeCmd.java
index 26cc50e..4416a37 100644
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@ -31,6 +31,7 @@ import java.util.concurrent.ExecutionException;
import com.google.common.base.Joiner;
import com.google.common.collect.LinkedHashMultimap;
import com.google.common.collect.Maps;
+import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.commons.cli.*;
import org.yaml.snakeyaml.Loader;
@@ -279,6 +280,12 @@ public class NodeCmd
{
throw new RuntimeException(e);
}
+
+ if(DatabaseDescriptor.getNumTokens() > 1)
+ {
+ outs.println(" Warning: \"nodetool ring\" is used to output all the tokens of a node.");
+ outs.println(" To view status related info of a node use \"nodetool status\" instead.\n");
+ }
}
private void printDc(PrintStream outs, String format, String dc, LinkedHashMultimap<String, String> endpointsToTokens,
[3/8] git commit: Print a warning when using nodetool ring with
vnodes. Patch by Lyuben Todorov,
reviewed by brandonwilliams for CASSANDRA-5954
Posted by br...@apache.org.
Print a warning when using nodetool ring with vnodes.
Patch by Lyuben Todorov, reviewed by brandonwilliams for CASSANDRA-5954
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fa8d9231
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fa8d9231
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fa8d9231
Branch: refs/heads/cassandra-2.0
Commit: fa8d92312e2f881fab8e58c8afc7265bd0d52bab
Parents: bb3ec4c
Author: Brandon Williams <br...@apache.org>
Authored: Tue Sep 24 10:26:04 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Sep 24 10:26:04 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/NodeCmd.java | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fa8d9231/src/java/org/apache/cassandra/tools/NodeCmd.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/NodeCmd.java b/src/java/org/apache/cassandra/tools/NodeCmd.java
index 26cc50e..4416a37 100644
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@ -31,6 +31,7 @@ import java.util.concurrent.ExecutionException;
import com.google.common.base.Joiner;
import com.google.common.collect.LinkedHashMultimap;
import com.google.common.collect.Maps;
+import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.commons.cli.*;
import org.yaml.snakeyaml.Loader;
@@ -279,6 +280,12 @@ public class NodeCmd
{
throw new RuntimeException(e);
}
+
+ if(DatabaseDescriptor.getNumTokens() > 1)
+ {
+ outs.println(" Warning: \"nodetool ring\" is used to output all the tokens of a node.");
+ outs.println(" To view status related info of a node use \"nodetool status\" instead.\n");
+ }
}
private void printDc(PrintStream outs, String format, String dc, LinkedHashMultimap<String, String> endpointsToTokens,
[7/8] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/424206a1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/424206a1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/424206a1
Branch: refs/heads/cassandra-2.0
Commit: 424206a154297c5ea3a50506aa9e2a1a669f76c1
Parents: 326d545 fa8d923
Author: Brandon Williams <br...@apache.org>
Authored: Tue Sep 24 10:29:09 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Sep 24 10:29:09 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 ++
src/java/org/apache/cassandra/gms/Gossiper.java | 20 ++++++++++++++++----
.../apache/cassandra/service/StorageProxy.java | 3 ++-
.../org/apache/cassandra/tools/NodeCmd.java | 7 +++++++
4 files changed, 27 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/424206a1/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 4bc1fd6,ae2ab5e..281665e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,6 +1,12 @@@
-1.2.11
+2.0.2
+ * Improve memory usage of metadata min/max column names (CASSANDRA-6077)
+ * Fix thrift validation refusing row markers on CQL3 tables (CASSANDRA-6081)
+ * Fix insertion of collections with CAS (CASSANDRA-6069)
+ * Correctly send metadata on SELECT COUNT (CASSANDRA-6080)
+ * Track clients' remote addresses in ClientState (CASSANDRA-6070)
+Merged from 1.2:
+ * Avoid sending Truncate command to fat clients (CASSANDRA-6088)
+ * Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
* Allow where clause conditions to be in parenthesis (CASSANDRA-6037)
* Do not open non-ssl storage port if encryption option is all (CASSANDRA-3916)
* Move batchlog replay to its own executor (CASSANDRA-6079)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/424206a1/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/424206a1/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/424206a1/src/java/org/apache/cassandra/tools/NodeCmd.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/tools/NodeCmd.java
index 1ae5de8,4416a37..943db7d
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@@ -31,8 -31,11 +31,9 @@@ import java.util.concurrent.ExecutionEx
import com.google.common.base.Joiner;
import com.google.common.collect.LinkedHashMultimap;
import com.google.common.collect.Maps;
+ import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.commons.cli.*;
-import org.yaml.snakeyaml.Loader;
-import org.yaml.snakeyaml.TypeDescription;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.Constructor;
[6/8] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/424206a1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/424206a1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/424206a1
Branch: refs/heads/trunk
Commit: 424206a154297c5ea3a50506aa9e2a1a669f76c1
Parents: 326d545 fa8d923
Author: Brandon Williams <br...@apache.org>
Authored: Tue Sep 24 10:29:09 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Sep 24 10:29:09 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 ++
src/java/org/apache/cassandra/gms/Gossiper.java | 20 ++++++++++++++++----
.../apache/cassandra/service/StorageProxy.java | 3 ++-
.../org/apache/cassandra/tools/NodeCmd.java | 7 +++++++
4 files changed, 27 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/424206a1/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 4bc1fd6,ae2ab5e..281665e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,6 +1,12 @@@
-1.2.11
+2.0.2
+ * Improve memory usage of metadata min/max column names (CASSANDRA-6077)
+ * Fix thrift validation refusing row markers on CQL3 tables (CASSANDRA-6081)
+ * Fix insertion of collections with CAS (CASSANDRA-6069)
+ * Correctly send metadata on SELECT COUNT (CASSANDRA-6080)
+ * Track clients' remote addresses in ClientState (CASSANDRA-6070)
+Merged from 1.2:
+ * Avoid sending Truncate command to fat clients (CASSANDRA-6088)
+ * Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
* Allow where clause conditions to be in parenthesis (CASSANDRA-6037)
* Do not open non-ssl storage port if encryption option is all (CASSANDRA-3916)
* Move batchlog replay to its own executor (CASSANDRA-6079)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/424206a1/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/424206a1/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/424206a1/src/java/org/apache/cassandra/tools/NodeCmd.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/tools/NodeCmd.java
index 1ae5de8,4416a37..943db7d
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@@ -31,8 -31,11 +31,9 @@@ import java.util.concurrent.ExecutionEx
import com.google.common.base.Joiner;
import com.google.common.collect.LinkedHashMultimap;
import com.google.common.collect.Maps;
+ import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.commons.cli.*;
-import org.yaml.snakeyaml.Loader;
-import org.yaml.snakeyaml.TypeDescription;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.Constructor;
[2/8] git commit: Avoid sending Truncate command to fat clients patch
by Oleg Anastasyev; reviewed by jbellis for CASSANDRA-6088
Posted by br...@apache.org.
Avoid sending Truncate command to fat clients
patch by Oleg Anastasyev; reviewed by jbellis for CASSANDRA-6088
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bb3ec4ce
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bb3ec4ce
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bb3ec4ce
Branch: refs/heads/trunk
Commit: bb3ec4ce9ec020d0bf7963517f802c2b86e9047a
Parents: 3a4d10f
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Sep 24 10:12:20 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Sep 24 10:12:20 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/gms/Gossiper.java | 20 ++++++++++++++++----
.../apache/cassandra/service/StorageProxy.java | 4 ++--
3 files changed, 19 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bb3ec4ce/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index cecb88a..ae2ab5e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
1.2.11
+ * Avoid sending Truncate command to fat clients (CASSANDRA-6088)
* Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
* Allow where clause conditions to be in parenthesis (CASSANDRA-6037)
* Do not open non-ssl storage port if encryption option is all (CASSANDRA-3916)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bb3ec4ce/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java b/src/java/org/apache/cassandra/gms/Gossiper.java
index b4ea88a..acf40f3 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -218,10 +218,22 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
public Set<InetAddress> getLiveMembers()
{
- Set<InetAddress> liveMbrs = new HashSet<InetAddress>(liveEndpoints);
- if (!liveMbrs.contains(FBUtilities.getBroadcastAddress()))
- liveMbrs.add(FBUtilities.getBroadcastAddress());
- return liveMbrs;
+ Set<InetAddress> liveMembers = new HashSet<InetAddress>(liveEndpoints);
+ if (!liveMembers.contains(FBUtilities.getBroadcastAddress()))
+ liveMembers.add(FBUtilities.getBroadcastAddress());
+ return liveMembers;
+ }
+
+ public Set<InetAddress> getLiveTokenOwners()
+ {
+ Set<InetAddress> tokenOwners = new HashSet<InetAddress>();
+ for (InetAddress member : getLiveMembers())
+ {
+ EndpointState epState = endpointStateMap.get(member);
+ if (epState != null && !isDeadState(epState) && StorageService.instance.getTokenMetadata().isMember(member))
+ tokenOwners.add(member);
+ }
+ return tokenOwners;
}
public Set<InetAddress> getUnreachableMembers()
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bb3ec4ce/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java
index be92213..8a6e52e 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -25,7 +25,6 @@ import java.nio.ByteBuffer;
import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -1551,7 +1550,8 @@ public class StorageProxy implements StorageProxyMBean
throw new UnavailableException(ConsistencyLevel.ALL, liveMembers + Gossiper.instance.getUnreachableMembers().size(), liveMembers);
}
- Set<InetAddress> allEndpoints = Gossiper.instance.getLiveMembers();
+ Set<InetAddress> allEndpoints = Gossiper.instance.getLiveTokenOwners();
+
int blockFor = allEndpoints.size();
final TruncateResponseHandler responseHandler = new TruncateResponseHandler(blockFor);
[5/8] git commit: Print a warning when using nodetool ring with
vnodes. Patch by Lyuben Todorov,
reviewed by brandonwilliams for CASSANDRA-5954
Posted by br...@apache.org.
Print a warning when using nodetool ring with vnodes.
Patch by Lyuben Todorov, reviewed by brandonwilliams for CASSANDRA-5954
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fa8d9231
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fa8d9231
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fa8d9231
Branch: refs/heads/cassandra-1.2
Commit: fa8d92312e2f881fab8e58c8afc7265bd0d52bab
Parents: bb3ec4c
Author: Brandon Williams <br...@apache.org>
Authored: Tue Sep 24 10:26:04 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Sep 24 10:26:04 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/NodeCmd.java | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fa8d9231/src/java/org/apache/cassandra/tools/NodeCmd.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/NodeCmd.java b/src/java/org/apache/cassandra/tools/NodeCmd.java
index 26cc50e..4416a37 100644
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@ -31,6 +31,7 @@ import java.util.concurrent.ExecutionException;
import com.google.common.base.Joiner;
import com.google.common.collect.LinkedHashMultimap;
import com.google.common.collect.Maps;
+import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.commons.cli.*;
import org.yaml.snakeyaml.Loader;
@@ -279,6 +280,12 @@ public class NodeCmd
{
throw new RuntimeException(e);
}
+
+ if(DatabaseDescriptor.getNumTokens() > 1)
+ {
+ outs.println(" Warning: \"nodetool ring\" is used to output all the tokens of a node.");
+ outs.println(" To view status related info of a node use \"nodetool status\" instead.\n");
+ }
}
private void printDc(PrintStream outs, String format, String dc, LinkedHashMultimap<String, String> endpointsToTokens,
[8/8] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/938e6989
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/938e6989
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/938e6989
Branch: refs/heads/trunk
Commit: 938e6989a6f12a4cd68e6f0e7980b2687dd701e1
Parents: 455e673 424206a
Author: Brandon Williams <br...@apache.org>
Authored: Tue Sep 24 10:29:23 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Sep 24 10:29:23 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 ++
src/java/org/apache/cassandra/gms/Gossiper.java | 20 ++++++++++++++++----
.../apache/cassandra/service/StorageProxy.java | 3 ++-
.../org/apache/cassandra/tools/NodeCmd.java | 7 +++++++
4 files changed, 27 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/938e6989/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/938e6989/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/938e6989/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------