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 2017/08/26 00:26:33 UTC
[03/10] cassandra git commit: Make
BatchlogManagerMBean.forceBatchlogReplay() blocking
Make BatchlogManagerMBean.forceBatchlogReplay() blocking
patch by Aleksey Yeschenko; reviewed by Jeff Jirsa for CASSANDRA-13809
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c6dec2f0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c6dec2f0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c6dec2f0
Branch: refs/heads/cassandra-3.11
Commit: c6dec2f0e02eb3ae9b9d070ec09cf822eda6bd2a
Parents: e1aa7d3
Author: Aleksey Yeschenko <al...@yeschenko.com>
Authored: Fri Aug 25 17:30:49 2017 +0100
Committer: Aleksey Yeschenko <al...@yeschenko.com>
Committed: Fri Aug 25 17:35:53 2017 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/BatchlogManager.java | 4 ++--
src/java/org/apache/cassandra/db/BatchlogManagerMBean.java | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c6dec2f0/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 2fbb7e9..4e68ddc 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.11
+ * Make BatchlogManagerMBean.forceBatchlogReplay() blocking (CASSANDRA-13809)
* Uncaught exceptions in Netty pipeline (CASSANDRA-13649)
* Prevent integer overflow on exabyte filesystems (CASSANDRA-13067)
* Fix queries with LIMIT and filtering on clustering columns (CASSANDRA-11223)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c6dec2f0/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 ba56f0d..9a2d1f6 100644
--- a/src/java/org/apache/cassandra/db/BatchlogManager.java
+++ b/src/java/org/apache/cassandra/db/BatchlogManager.java
@@ -112,9 +112,9 @@ public class BatchlogManager implements BatchlogManagerMBean
return totalBatchesReplayed.longValue();
}
- public void forceBatchlogReplay()
+ public void forceBatchlogReplay() throws Exception
{
- startBatchlogReplay();
+ startBatchlogReplay().get();
}
public Future<?> startBatchlogReplay()
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c6dec2f0/src/java/org/apache/cassandra/db/BatchlogManagerMBean.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/BatchlogManagerMBean.java b/src/java/org/apache/cassandra/db/BatchlogManagerMBean.java
index 2e60ba4..5ddf232 100644
--- a/src/java/org/apache/cassandra/db/BatchlogManagerMBean.java
+++ b/src/java/org/apache/cassandra/db/BatchlogManagerMBean.java
@@ -32,7 +32,7 @@ public interface BatchlogManagerMBean
public long getTotalBatchesReplayed();
/**
- * Forces batchlog replay. Returns immediately if replay is already in progress.
+ * Forces batchlog replay. Blocks until completion.
*/
- public void forceBatchlogReplay();
+ public void forceBatchlogReplay() throws Exception;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org