Merge 44fe527a42
into 88d9bdc5b2
This commit is contained in:
commit
293183e2f6
|
@ -648,11 +648,12 @@ public class StorageService extends MetricsMBean implements StorageServiceMBean,
|
||||||
* Forces major compaction of a single keyspace
|
* Forces major compaction of a single keyspace
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void forceKeyspaceCompaction(String keyspaceName, String... columnFamilies)
|
public void forceKeyspaceCompaction(boolean offStrategy, String keyspaceName, String... columnFamilies)
|
||||||
throws IOException, ExecutionException, InterruptedException {
|
throws IOException, ExecutionException, InterruptedException {
|
||||||
log(" forceKeyspaceCompaction(String keyspaceName, String... columnFamilies) throws IOException, ExecutionException, InterruptedException");
|
log(" forceKeyspaceCompaction(boolean offStrategy, String keyspaceName, String... columnFamilies) throws IOException, ExecutionException, InterruptedException");
|
||||||
MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<String, String>();
|
MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<String, String>();
|
||||||
APIClient.set_query_param(queryParams, "cf", APIClient.join(columnFamilies));
|
APIClient.set_query_param(queryParams, "cf", APIClient.join(columnFamilies));
|
||||||
|
APIClient.set_bool_query_param(queryParams, "offstrategy", offStrategy);
|
||||||
client.post("/storage_service/keyspace_compaction/" + keyspaceName, queryParams);
|
client.post("/storage_service/keyspace_compaction/" + keyspaceName, queryParams);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -660,7 +661,7 @@ public class StorageService extends MetricsMBean implements StorageServiceMBean,
|
||||||
public void forceKeyspaceCompactionForTokenRange(String keyspaceName, String startToken, String endToken,
|
public void forceKeyspaceCompactionForTokenRange(String keyspaceName, String startToken, String endToken,
|
||||||
String... tableNames) throws IOException, ExecutionException, InterruptedException {
|
String... tableNames) throws IOException, ExecutionException, InterruptedException {
|
||||||
// TODO: actually handle token ranges.
|
// TODO: actually handle token ranges.
|
||||||
forceKeyspaceCompaction(keyspaceName, tableNames);
|
forceKeyspaceCompaction(false, keyspaceName, tableNames);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -1716,10 +1717,10 @@ public class StorageService extends MetricsMBean implements StorageServiceMBean,
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void forceKeyspaceCompaction(boolean splitOutput, String keyspaceName, String... tableNames)
|
public void forceKeyspaceCompaction(boolean splitOutput, boolean offStrategy, String keyspaceName, String... tableNames)
|
||||||
throws IOException, ExecutionException, InterruptedException {
|
throws IOException, ExecutionException, InterruptedException {
|
||||||
// "splitOutput" afaik not relevant for scylla (yet?...)
|
// "splitOutput" afaik not relevant for scylla (yet?...)
|
||||||
forceKeyspaceCompaction(keyspaceName, tableNames);
|
forceKeyspaceCompaction(offStrategy, keyspaceName, tableNames);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -312,13 +312,13 @@ public interface StorageServiceMBean extends NotificationEmitter {
|
||||||
/**
|
/**
|
||||||
* Forces major compaction of a single keyspace
|
* Forces major compaction of a single keyspace
|
||||||
*/
|
*/
|
||||||
public void forceKeyspaceCompaction(boolean splitOutput, String keyspaceName, String... tableNames)
|
public void forceKeyspaceCompaction(boolean splitOutput, boolean offStrategy, String keyspaceName, String... tableNames)
|
||||||
throws IOException, ExecutionException, InterruptedException;
|
throws IOException, ExecutionException, InterruptedException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Forces major compaction of a single keyspace.
|
* Forces major compaction of a single keyspace.
|
||||||
*/
|
*/
|
||||||
public void forceKeyspaceCompaction(String keyspaceName, String... tableNames)
|
public void forceKeyspaceCompaction(boolean offStrategy, String keyspaceName, String... tableNames)
|
||||||
throws IOException, ExecutionException, InterruptedException;
|
throws IOException, ExecutionException, InterruptedException;
|
||||||
|
|
||||||
@Deprecated
|
@Deprecated
|
||||||
|
|
Loading…
Reference in New Issue
Block a user