andreacavalli/scylla-jmx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support --load-and-stream option from nodetool refresh

Browse Source 
This information is translated to {"load_and_stream", "true"} entry in the
POST request to Scylla's HTTP API at `storage_service/sstables/{keyspace}`
endpoint.

More about this feature: scylladb/scylla#7846

This change is a consequence of scylladb/scylla-tools-java#253.
This commit is contained in:
Juliusz Stasiewicz 2021-08-30 17:54:05 +02:00 committed by Avi Kivity
parent 70b19e6270
commit 658818b2d0
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/org/apache/cassandra/service/StorageService.java
View File

@ -1417,15 +1417,25 @@ public class StorageService extends MetricsMBean implements StorageServiceMBean,
* The parent keyspace name * The parent keyspace name
* @param cfName * @param cfName
* The ColumnFamily name where SSTables belong * The ColumnFamily name where SSTables belong
* @param isLoadAndStream
* Whether or not arbitrary SSTables should be loaded (and streamed to the owning nodes)
*/ */
@Override @Override
public void loadNewSSTables(String ksName, String cfName) { public void loadNewSSTables(String ksName, String cfName, boolean isLoadAndStream) {
log(" loadNewSSTables(String ksName, String cfName)"); log(" loadNewSSTables(String ksName, String cfName, boolean isLoadAndStream)");
MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<String, String>(); MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<String, String>();
queryParams.add("cf", cfName); queryParams.add("cf", cfName);
if (isLoadAndStream) {
queryParams.add("load_and_stream", "true");
}
client.post("/storage_service/sstables/" + ksName, queryParams); client.post("/storage_service/sstables/" + ksName, queryParams);
} }
@Override
public void loadNewSSTables(String ksName, String cfName) {
loadNewSSTables(ksName, cfName, false);
}
/** /**
* Return a List of Tokens representing a sample of keys across all * Return a List of Tokens representing a sample of keys across all
* ColumnFamilyStores. * ColumnFamilyStores.

9
src/main/java/org/apache/cassandra/service/StorageServiceMBean.java
View File

@ -808,7 +808,16 @@ public interface StorageServiceMBean extends NotificationEmitter {
* The parent keyspace name * The parent keyspace name
* @param cfName * @param cfName
* The ColumnFamily name where SSTables belong * The ColumnFamily name where SSTables belong
* @param isLoadAndStream
* Whether or not arbitrary SSTables should be loaded (and streamed to the owning nodes)
*/ */
public void loadNewSSTables(String ksName, String cfName, boolean isLoadAndStream);
/**
* @deprecated use {@link #loadNewSSTables(String ksName, String cfName, boolean isLoadAndStream)} instead.
* This is kept for backward compatibility.
*/
@Deprecated
public void loadNewSSTables(String ksName, String cfName); public void loadNewSSTables(String ksName, String cfName);
/** /**