cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject svn commit: r1021930 - in /cassandra/trunk/src/java/org/apache/cassandra: service/StorageService.java service/StorageServiceMBean.java tools/NodeCmd.java tools/NodeProbe.java
Date Tue, 12 Oct 2010 21:22:40 GMT
Author: jbellis
Date: Tue Oct 12 21:22:40 2010
New Revision: 1021930

URL: http://svn.apache.org/viewvc?rev=1021930&view=rev
Log:
rename finishRemoval to forceRemoveCompletion.  patch by jbellis

Modified:
    cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
    cassandra/trunk/src/java/org/apache/cassandra/service/StorageServiceMBean.java
    cassandra/trunk/src/java/org/apache/cassandra/tools/NodeCmd.java
    cassandra/trunk/src/java/org/apache/cassandra/tools/NodeProbe.java

Modified: cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java?rev=1021930&r1=1021929&r2=1021930&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java Tue Oct 12 21:22:40
2010
@@ -1703,8 +1703,10 @@ public class StorageService implements I
      * Force a remove operation to complete. This may be necessary if a remove operation
      * blocks forever due to node/stream failure.
      */
-    public void finishRemoval()
+    public void forceRemoveCompletion()
     {
+        if (!replicatingNodes.isEmpty())
+            logger_.warn("Removal not confirmed for for " + StringUtils.join(this.replicatingNodes,
","));
         replicatingNodes.clear();
     }
 
@@ -1785,9 +1787,6 @@ public class StorageService implements I
         calculatePendingRanges();
         Gossiper.instance.addLocalApplicationState(ApplicationState.STATUS, valueFactory.removedNonlocal(localToken,
token));
 
-        if(!this.replicatingNodes.isEmpty())
-            logger_.error("Failed to recieve removal confirmation for " + StringUtils.join(this.replicatingNodes,
","));
-
         replicatingNodes = null;
         removingNode = null;
     }

Modified: cassandra/trunk/src/java/org/apache/cassandra/service/StorageServiceMBean.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/service/StorageServiceMBean.java?rev=1021930&r1=1021929&r2=1021930&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/service/StorageServiceMBean.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/service/StorageServiceMBean.java Tue Oct
12 21:22:40 2010
@@ -217,7 +217,7 @@ public interface StorageServiceMBean
     /**
      * Force a remove operation to finish.
      */
-    public void finishRemoval();
+    public void forceRemoveCompletion();
 
     /** set the logging level at runtime */
     public void setLog4jLevel(String classQualifier, String level);

Modified: cassandra/trunk/src/java/org/apache/cassandra/tools/NodeCmd.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/tools/NodeCmd.java?rev=1021930&r1=1021929&r2=1021930&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/tools/NodeCmd.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/tools/NodeCmd.java Tue Oct 12 21:22:40 2010
@@ -484,7 +484,7 @@ public class NodeCmd {
             else if (arguments[1].equals("force"))
             {
                 nodeCmd.printRemovalStatus(System.out);
-                probe.finishRemoval();
+                probe.forceRemoveCompletion();
             }
             else
                 probe.removeToken(arguments[1]);

Modified: cassandra/trunk/src/java/org/apache/cassandra/tools/NodeProbe.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/tools/NodeProbe.java?rev=1021930&r1=1021929&r2=1021930&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/tools/NodeProbe.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/tools/NodeProbe.java Tue Oct 12 21:22:40
2010
@@ -305,9 +305,9 @@ public class NodeProbe
         return ssProxy.getRemovalStatus();
     }
 
-    public void finishRemoval()
+    public void forceRemoveCompletion()
     {
-        ssProxy.finishRemoval();
+        ssProxy.forceRemoveCompletion();
     }
   
     public Iterator<Map.Entry<String, IExecutorMBean>> getThreadPoolMBeanProxies()



Mime
View raw message