[3/3] git commit: Merge branch 'cassandra-2.1' into trunk

[marcuse]

Merge branch 'cassandra-2.1' into trunk

Conflicts:
        src/java/org/apache/cassandra/tools/NodeProbe.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/37a9d405
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/37a9d405
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/37a9d405

Branch: refs/heads/trunk
Commit: 37a9d405c7fe5de84450e20960d94a134d3e85e9
Parents: 719bb39 dd972e6
Author: Marcus Eriksson <marc...@apache.org>
Authored: Fri Sep 5 11:10:40 2014 +0200
Committer: Marcus Eriksson <marc...@apache.org>
Committed: Fri Sep 5 11:10:40 2014 +0200

----------------------------------------------------------------------
 CHANGES.txt                                     |  2 ++
 .../db/compaction/CompactionManager.java        |  9 +++++-
 .../cassandra/service/StorageService.java       | 12 ++++----
 .../cassandra/service/StorageServiceMBean.java  |  6 ++--
 .../org/apache/cassandra/tools/NodeProbe.java   | 30 ++++++++------------
 5 files changed, 31 insertions(+), 28 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/37a9d405/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/37a9d405/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/37a9d405/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/37a9d405/src/java/org/apache/cassandra/tools/NodeProbe.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/tools/NodeProbe.java
index a0d4db7,3f3073d..55f462e
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@@ -203,34 -203,28 +203,28 @@@ public class NodeProbe implements AutoC
  
      public void forceKeyspaceCleanup(PrintStream out, String keyspaceName, 
String... columnFamilies) throws IOException, ExecutionException, 
InterruptedException
      {
-         switch (forceKeyspaceCleanup(keyspaceName, columnFamilies))
+         if (forceKeyspaceCleanup(keyspaceName, columnFamilies) != 0)
          {
-             case ABORTED:
-                 failed = true;
-                 out.println("Aborted cleaning up atleast one table in 
keyspace "+keyspaceName+", check server logs for more information.");
-                 break;
+             failed = true;
 -            out.println("Aborted cleaning up atleast one column family in 
keyspace "+keyspaceName+", check server logs for more information.");
++            out.println("Aborted cleaning up atleast one table in keyspace 
"+keyspaceName+", check server logs for more information.");
          }
      }
  
      public void scrub(PrintStream out, boolean disableSnapshot, boolean 
skipCorrupted, String keyspaceName, String... columnFamilies) throws 
IOException, ExecutionException, InterruptedException
      {
-         switch (scrub(disableSnapshot, skipCorrupted, keyspaceName, 
columnFamilies))
+         if (scrub(disableSnapshot, skipCorrupted, keyspaceName, 
columnFamilies) != 0)
          {
-             case ABORTED:
-                 failed = true;
-                 out.println("Aborted scrubbing atleast one table in keyspace 
"+keyspaceName+", check server logs for more information.");
-                 break;
+             failed = true;
 -            out.println("Aborted scrubbing atleast one column family in 
keyspace "+keyspaceName+", check server logs for more information.");
++            out.println("Aborted scrubbing atleast one table in keyspace 
"+keyspaceName+", check server logs for more information.");
          }
      }
  
      public void upgradeSSTables(PrintStream out, String keyspaceName, boolean 
excludeCurrentVersion, String... columnFamilies) throws IOException, 
ExecutionException, InterruptedException
      {
-         switch (upgradeSSTables(keyspaceName, excludeCurrentVersion, 
columnFamilies))
+         if (upgradeSSTables(keyspaceName, excludeCurrentVersion, 
columnFamilies) != 0)
          {
-             case ABORTED:
-                 failed = true;
-                 out.println("Aborted upgrading sstables for atleast one table 
in keyspace "+keyspaceName+", check server logs for more information.");
-                 break;
+             failed = true;
 -            out.println("Aborted upgrading sstables for atleast one column 
family in keyspace "+keyspaceName+", check server logs for more information.");
++            out.println("Aborted upgrading sstables for atleast one table in 
keyspace "+keyspaceName+", check server logs for more information.");
          }
      }