cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [3/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Fri, 11 Apr 2014 18:04:05 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/service/StorageService.java


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

Branch: refs/heads/trunk
Commit: 3f00662a199f35275226f5ccfce2b81d227cf38c
Parents: 9d08e50 8845c51
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Fri Apr 11 21:02:16 2014 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Fri Apr 11 21:02:16 2014 +0300

----------------------------------------------------------------------
 CHANGES.txt                                               | 1 +
 src/java/org/apache/cassandra/db/BatchlogManager.java     | 2 +-
 src/java/org/apache/cassandra/service/StorageService.java | 3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3f00662a/src/java/org/apache/cassandra/db/BatchlogManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3f00662a/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 3e94172,7382cbd..6e18567
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -3543,10 -3461,9 +3543,13 @@@ public class StorageService extends Not
          }
          FBUtilities.waitOnFutures(flushes);
  
+         BatchlogManager.batchlogTasks.shutdown();
+         BatchlogManager.batchlogTasks.awaitTermination(60, TimeUnit.SECONDS);
+ 
 +        // whilst we've flushed all the CFs, which will have recycled all completed segments,
we want to ensure
 +        // there are no segments to replay, so we force the recycling of any remaining (should
be at most one)
 +        CommitLog.instance.forceRecycleAllSegments();
 +
          ColumnFamilyStore.postFlushExecutor.shutdown();
          ColumnFamilyStore.postFlushExecutor.awaitTermination(60, TimeUnit.SECONDS);
  


Mime
View raw message