You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jj...@apache.org on 2017/04/05 17:11:57 UTC
[3/6] cassandra git commit: Nodetool upgradesstables doesnt upgrade
system tables
Nodetool upgradesstables doesnt upgrade system tables
Patch by Jeff Jirsa; Reviewed by Marcus Eriksson for CASSANDRA-13410
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6efb44b3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6efb44b3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6efb44b3
Branch: refs/heads/trunk
Commit: 6efb44b3ab5816cb7c2b007dba68b3224f899ac8
Parents: 0efb392
Author: Jeff Jirsa <jj...@apple.com>
Authored: Mon Apr 3 17:41:54 2017 -0700
Committer: Jeff Jirsa <je...@jeffjirsa.net>
Committed: Wed Apr 5 10:09:41 2017 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/tools/NodeTool.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6efb44b3/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index d9a97ad..8bd21bc 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -15,6 +15,7 @@
* Slice.isEmpty() returns false for some empty slices (CASSANDRA-13305)
* Add formatted row output to assertEmpty in CQL Tester (CASSANDRA-13238)
* Legacy caching options can prevent 3.0 upgrade (CASSANDRA-13384)
+ * Nodetool upgradesstables/scrub/compact ignores system tables (CASSANDRA-13410)
Merged from 2.2:
* Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773)
* Discard in-flight shadow round responses (CASSANDRA-12653)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6efb44b3/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 7d125ad..6d060f4 100644
--- a/src/java/org/apache/cassandra/tools/NodeTool.java
+++ b/src/java/org/apache/cassandra/tools/NodeTool.java
@@ -322,7 +322,7 @@ public class NodeTool
protected List<String> parseOptionalKeyspace(List<String> cmdArgs, NodeProbe nodeProbe)
{
- return parseOptionalKeyspace(cmdArgs, nodeProbe, KeyspaceSet.NON_SYSTEM);
+ return parseOptionalKeyspace(cmdArgs, nodeProbe, KeyspaceSet.ALL);
}
protected List<String> parseOptionalKeyspace(List<String> cmdArgs, NodeProbe nodeProbe, KeyspaceSet defaultKeyspaceSet)