You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2013/10/21 18:28:06 UTC
[1/2] git commit: BM.forceBatchlogReplay() should be executed in
batchlogTasks
Updated Branches:
refs/heads/cassandra-2.0 20f1b816b -> 0c5f05bd9
BM.forceBatchlogReplay() should be executed in batchlogTasks
follow-up to CASSANDRA-6079
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7e057f50
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7e057f50
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7e057f50
Branch: refs/heads/cassandra-2.0
Commit: 7e057f504613e68082a76642983d353f3f0400fb
Parents: 189a607
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Oct 22 00:26:05 2013 +0800
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Oct 22 00:26:05 2013 +0800
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/BatchlogManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e057f50/src/java/org/apache/cassandra/db/BatchlogManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/BatchlogManager.java b/src/java/org/apache/cassandra/db/BatchlogManager.java
index 2488458..5fd55a3 100644
--- a/src/java/org/apache/cassandra/db/BatchlogManager.java
+++ b/src/java/org/apache/cassandra/db/BatchlogManager.java
@@ -118,7 +118,7 @@ public class BatchlogManager implements BatchlogManagerMBean
replayAllFailedBatches();
}
};
- StorageService.optionalTasks.execute(runnable);
+ batchlogTasks.execute(runnable);
}
public static RowMutation getBatchlogMutationFor(Collection<RowMutation> mutations, UUID uuid)
[2/2] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by al...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0c5f05bd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0c5f05bd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0c5f05bd
Branch: refs/heads/cassandra-2.0
Commit: 0c5f05bd966edfdfdb78baa31dd57e1a90488227
Parents: 20f1b81 7e057f5
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Oct 22 00:27:56 2013 +0800
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Oct 22 00:27:56 2013 +0800
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/BatchlogManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0c5f05bd/src/java/org/apache/cassandra/db/BatchlogManager.java
----------------------------------------------------------------------