cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [4/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Sat, 13 Sep 2014 19:45:11 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: 58c9a4c44f4396f603afde9a4d81e9f9ebc10f47
Parents: 1cef273 169ec3d
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Sat Sep 13 14:44:52 2014 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Sat Sep 13 14:44:52 2014 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/service/StorageService.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/58c9a4c4/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index fb4e6e6,7f92034..788d425
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -562,14 -559,14 +562,15 @@@ public class StorageService extends Not
          Thread drainOnShutdown = new Thread(new WrappedRunnable()
          {
              @Override
 -            public void runMayThrow() throws ExecutionException, InterruptedException, IOException
 +            public void runMayThrow() throws InterruptedException
              {
 +                ExecutorService counterMutationStage = StageManager.getStage(Stage.COUNTER_MUTATION);
                  ExecutorService mutationStage = StageManager.getStage(Stage.MUTATION);
 -                if (mutationStage.isShutdown())
 +                if (mutationStage.isShutdown() && counterMutationStage.isShutdown())
                      return; // drained already
  
-                 shutdownClientServers();
+                 if (daemon != null)
+                 	shutdownClientServers();
                  optionalTasks.shutdown();
                  Gossiper.instance.stop();
  


Mime
View raw message