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

Merge branch 'cassandra-2.2' into cassandra-3.0

This commit is contained in:
Yuki Morishita 2015-11-30 10:31:37 -06:00
parent 4c56c89a1e a013f3e05a
commit 44164bc3ab
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/java/org/apache/cassandra/service/StorageServiceMBean.java
View File

@ -299,8 +299,11 @@ public interface StorageServiceMBean extends NotificationEmitter
*/ */
public int repairAsync(String keyspace, Map<String, String> options); public int repairAsync(String keyspace, Map<String, String> options);
/**
* @deprecated use {@link #repairAsync(String keyspace, Map options)} instead.
*/
@Deprecated @Deprecated
public int forceRepairAsync(String keyspace, boolean isSequential, Collection<String> dataCenters, Collection<String> hosts, boolean primaryRange, boolean repairedAt, String... tableNames) throws IOException; public int forceRepairAsync(String keyspace, boolean isSequential, Collection<String> dataCenters, Collection<String> hosts, boolean primaryRange, boolean fullRepair, String... tableNames) throws IOException;
/** /**
* Invoke repair asynchronously. * Invoke repair asynchronously.
@ -309,28 +312,41 @@ public interface StorageServiceMBean extends NotificationEmitter
* type: "repair" * type: "repair"
* userObject: int array of length 2, [0]=command number, [1]=ordinal of ActiveRepairService.Status * userObject: int array of length 2, [0]=command number, [1]=ordinal of ActiveRepairService.Status
* *
* @deprecated use {@link #repairAsync(String keyspace, Map options)} instead.
*
* @param parallelismDegree 0: sequential, 1: parallel, 2: DC parallel * @param parallelismDegree 0: sequential, 1: parallel, 2: DC parallel
* @return Repair command number, or 0 if nothing to repair * @return Repair command number, or 0 if nothing to repair
*/ */
@Deprecated @Deprecated
public int forceRepairAsync(String keyspace, int parallelismDegree, Collection<String> dataCenters, Collection<String> hosts, boolean primaryRange, boolean fullRepair, String... tableNames); public int forceRepairAsync(String keyspace, int parallelismDegree, Collection<String> dataCenters, Collection<String> hosts, boolean primaryRange, boolean fullRepair, String... tableNames);
/**
* @deprecated use {@link #repairAsync(String keyspace, Map options)} instead.
*/
@Deprecated @Deprecated
public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, boolean isSequential, Collection<String> dataCenters, Collection<String> hosts, boolean repairedAt, String... tableNames) throws IOException; public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, boolean isSequential, Collection<String> dataCenters, Collection<String> hosts, boolean fullRepair, String... tableNames) throws IOException;
/** /**
* Same as forceRepairAsync, but handles a specified range * Same as forceRepairAsync, but handles a specified range
* *
* @deprecated use {@link #repairAsync(String keyspace, Map options)} instead.
*
* @param parallelismDegree 0: sequential, 1: parallel, 2: DC parallel * @param parallelismDegree 0: sequential, 1: parallel, 2: DC parallel
*/ */
@Deprecated @Deprecated
public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, int parallelismDegree, Collection<String> dataCenters, Collection<String> hosts, boolean fullRepair, String... tableNames); public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, int parallelismDegree, Collection<String> dataCenters, Collection<String> hosts, boolean fullRepair, String... tableNames);
/**
* @deprecated use {@link #repairAsync(String keyspace, Map options)} instead.
*/
@Deprecated @Deprecated
public int forceRepairAsync(String keyspace, boolean isSequential, boolean isLocal, boolean primaryRange, boolean fullRepair, String... tableNames); public int forceRepairAsync(String keyspace, boolean isSequential, boolean isLocal, boolean primaryRange, boolean fullRepair, String... tableNames);
/**
* @deprecated use {@link #repairAsync(String keyspace, Map options)} instead.
*/
@Deprecated @Deprecated
public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, boolean isSequential, boolean isLocal, boolean repairedAt, String... tableNames); public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, boolean isSequential, boolean isLocal, boolean fullRepair, String... tableNames);
public void forceTerminateAllRepairSessions(); public void forceTerminateAllRepairSessions();