natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make BatchlogManagerMBean.forceBatchlogReplay() blocking 

patch by Aleksey Yeschenko; reviewed by Jeff Jirsa for CASSANDRA-13809
This commit is contained in:
Aleksey Yeschenko 2017-08-25 17:30:49 +01:00
parent e1aa7d32c9
commit c6dec2f0e0
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -1,4 +1,5 @@
2.2.11 2.2.11
* Make BatchlogManagerMBean.forceBatchlogReplay() blocking (CASSANDRA-13809)
* Uncaught exceptions in Netty pipeline (CASSANDRA-13649) * Uncaught exceptions in Netty pipeline (CASSANDRA-13649)
* Prevent integer overflow on exabyte filesystems (CASSANDRA-13067) * Prevent integer overflow on exabyte filesystems (CASSANDRA-13067)
* Fix queries with LIMIT and filtering on clustering columns (CASSANDRA-11223) * Fix queries with LIMIT and filtering on clustering columns (CASSANDRA-11223)

4
src/java/org/apache/cassandra/db/BatchlogManager.java
View File

@ -112,9 +112,9 @@ public class BatchlogManager implements BatchlogManagerMBean
return totalBatchesReplayed.longValue(); return totalBatchesReplayed.longValue();
} }
public void forceBatchlogReplay() public void forceBatchlogReplay() throws Exception
{ {
startBatchlogReplay(); startBatchlogReplay().get();
} }
public Future<?> startBatchlogReplay() public Future<?> startBatchlogReplay()

4
src/java/org/apache/cassandra/db/BatchlogManagerMBean.java
View File

@ -32,7 +32,7 @@ public interface BatchlogManagerMBean
public long getTotalBatchesReplayed(); 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;
} }