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

StorageService: Add describering functionality

Browse Source 
This patch adds the describering method to StorageService, the
implementation is based on the storage_service API that is define in
storage_service.json

The implementation reflect the changes in the API, that returns an
object vs. the jmx_describe ring.

Signed-off-by: Amnon Heiman <amnon@scylladb.com>
Signed-off-by: Pekka Enberg <penberg@scylladb.com>
This commit is contained in:
Amnon Heiman 2015-11-08 12:10:57 +02:00 committed by Pekka Enberg
parent 81aa2a8279
commit fadfb9443c
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,6 +31,10 @@ import java.util.*;
import java.util.concurrent.*; import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicLong;
import javax.json.Json;
import javax.json.JsonArray;
import javax.json.JsonObject;
import javax.json.JsonWriter;
import javax.management.*; import javax.management.*;
import javax.management.openmbean.TabularData; import javax.management.openmbean.TabularData;
import javax.ws.rs.core.MultivaluedHashMap; import javax.ws.rs.core.MultivaluedHashMap;
@ -254,7 +258,18 @@ public class StorageService extends NotificationBroadcasterSupport
*/ */
public List<String> describeRingJMX(String keyspace) throws IOException { public List<String> describeRingJMX(String keyspace) throws IOException {
log(" describeRingJMX(String keyspace) throws IOException"); log(" describeRingJMX(String keyspace) throws IOException");
return c.getListStrValue("/storage_service/describe_ring/" + keyspace); JsonArray arr = c.getJsonArray("/storage_service/describe_ring/" + keyspace);
List<String> res = new ArrayList<String>();
for (int i = 0; i < arr.size(); i++) {
StringWriter stringWriter = new StringWriter();
JsonWriter writer = Json.createWriter(stringWriter);
JsonObject obj = arr.getJsonObject(i);
writer.writeObject(obj);
writer.close();
res.add(stringWriter.getBuffer().toString());
}
return res;
} }
/** /**