diff --git a/src/main/java/org/apache/cassandra/db/compaction/CompactionManager.java b/src/main/java/org/apache/cassandra/db/compaction/CompactionManager.java index 55c3a60..8733fb5 100644 --- a/src/main/java/org/apache/cassandra/db/compaction/CompactionManager.java +++ b/src/main/java/org/apache/cassandra/db/compaction/CompactionManager.java @@ -137,7 +137,7 @@ public class CompactionManager implements CompactionManagerMBean { @Deprecated public long getTotalBytesCompacted() { log(" getTotalBytesCompacted()"); - return c.getLongValue(""); + return metrics.bytesCompacted.count(); } /** @@ -187,7 +187,11 @@ public class CompactionManager implements CompactionManagerMBean { */ public int getCoreCompactorThreads() { log(" getCoreCompactorThreads()"); - return c.getIntValue(""); + /** + * Core size pool is meaningless, we still wants to return a valid reponse, + * just in case someone will try to call this method. + */ + return 1; } /** @@ -205,7 +209,11 @@ public class CompactionManager implements CompactionManagerMBean { */ public int getMaximumCompactorThreads() { log(" getMaximumCompactorThreads()"); - return c.getIntValue(""); + /** + * Core size pool is meaningless, we still wants to return a valid reponse, + * just in case someone will try to call this method. + */ + return 1; } /** @@ -223,7 +231,11 @@ public class CompactionManager implements CompactionManagerMBean { */ public int getCoreValidationThreads() { log(" getCoreValidationThreads()"); - return c.getIntValue(""); + /** + * Core validation size pool is meaningless, we still wants to return a valid reponse, + * just in case someone will try to call this method. + */ + return 1; } /** @@ -241,7 +253,11 @@ public class CompactionManager implements CompactionManagerMBean { */ public int getMaximumValidatorThreads() { log(" getMaximumValidatorThreads()"); - return c.getIntValue(""); + /** + * Core validation size pool is meaningless, we still wants to return a valid reponse, + * just in case someone will try to call this method. + */ + return 1; } /** diff --git a/src/main/java/org/apache/cassandra/net/MessagingService.java b/src/main/java/org/apache/cassandra/net/MessagingService.java index d8d4b1f..565819a 100644 --- a/src/main/java/org/apache/cassandra/net/MessagingService.java +++ b/src/main/java/org/apache/cassandra/net/MessagingService.java @@ -31,6 +31,8 @@ import javax.json.JsonArray; import javax.json.JsonObject; import javax.management.MBeanServer; import javax.management.ObjectName; +import javax.ws.rs.core.MultivaluedHashMap; +import javax.ws.rs.core.MultivaluedMap; import org.apache.cassandra.metrics.DroppedMessageMetrics; @@ -240,7 +242,9 @@ public final class MessagingService implements MessagingServiceMBean { public int getVersion(String address) throws UnknownHostException { log(" getVersion(String address) throws UnknownHostException"); - return c.getIntValue(""); + MultivaluedMap queryParams = new MultivaluedHashMap(); + queryParams.add("addr", address); + return c.getIntValue("/messaging_service/version", queryParams); } } diff --git a/src/main/java/org/apache/cassandra/service/StorageService.java b/src/main/java/org/apache/cassandra/service/StorageService.java index effff96..9b5b822 100644 --- a/src/main/java/org/apache/cassandra/service/StorageService.java +++ b/src/main/java/org/apache/cassandra/service/StorageService.java @@ -1446,8 +1446,7 @@ public class StorageService extends NotificationBroadcasterSupport @Override public double getTracingProbability() { - // TODO Auto-generated method stub log(" getTracingProbability()"); - return c.getDoubleValue(""); + return c.getDoubleValue("/storage_service/trace_probability"); } }