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

MessagingService: Move to APITimer and drop the pulling

Browse Source 
With the change to APITimer there is no longer a need to periodically
pull the API.

The verb will be register on the object initialization and will be
updated whenever they are been used.

Signed-off-by: Amnon Heiman <amnon@scylladb.com>
This commit is contained in:
Amnon Heiman 2016-05-17 13:04:55 +03:00
parent 7756f4751a
commit 1e4edeb858
1 changed files with 8 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/main/java/org/apache/cassandra/net/MessagingService.java
View File

@ -31,12 +31,10 @@ import javax.json.JsonArray;
import javax.json.JsonObject; import javax.json.JsonObject;
import javax.management.MBeanServer; import javax.management.MBeanServer;
import javax.management.ObjectName; import javax.management.ObjectName;
import javax.ws.rs.ProcessingException;
import org.apache.cassandra.metrics.DroppedMessageMetrics; import org.apache.cassandra.metrics.DroppedMessageMetrics;
import com.scylladb.jmx.api.APIClient; import com.scylladb.jmx.api.APIClient;
import com.yammer.metrics.core.APISettableMeter;
public final class MessagingService implements MessagingServiceMBean { public final class MessagingService implements MessagingServiceMBean {
static final int INTERVAL = 1000; // update every 1second static final int INTERVAL = 1000; // update every 1second
@ -101,56 +99,26 @@ public final class MessagingService implements MessagingServiceMBean {
logger.finest(str); logger.finest(str);
} }
private static Timer timer = new Timer("Dropped messages");
public MessagingService() { public MessagingService() {
MBeanServer mbs = ManagementFactory.getPlatformMBeanServer(); MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
try { try {
jmxObjectName = new ObjectName(MBEAN_NAME); jmxObjectName = new ObjectName(MBEAN_NAME);
mbs.registerMBean(this, jmxObjectName); mbs.registerMBean(this, jmxObjectName);
// mbs.registerMBean(StreamManager.instance, new ObjectName( dropped = new HashMap<String, DroppedMessageMetrics>();
// StreamManager.OBJECT_NAME)); for (Verb v : Verb.values()) {
dropped.put(v.name(), new DroppedMessageMetrics(v));
}
} catch (Exception e) { } catch (Exception e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
timer.schedule(new CheckDroppedMessages(), INTERVAL, INTERVAL);
} }
static MessagingService instance = new MessagingService(); static MessagingService instance;
private static final class CheckDroppedMessages extends TimerTask {
int connection_failure = 0;
int report_error = 1;
@Override
public void run() {
if (instance.dropped == null) {
instance.dropped = new HashMap<String, DroppedMessageMetrics>();
for (Verb v : Verb.values()) {
instance.dropped.put(v.name(), new DroppedMessageMetrics(v));
}
}
try {
Map<String, Integer> val = instance.getDroppedMessages();
for (String k : val.keySet()) {
APISettableMeter meter = instance.dropped.get(k).getMeter();
meter.set(val.get(k));
meter.tick();
}
connection_failure = 0;
report_error = 1;
} catch (IllegalStateException e) {
// Connection problem, No need to do anything, just retry.
} catch (Exception e) {
connection_failure++;
if ((connection_failure & report_error) == report_error) {
logger.info("Dropped messages failed with " + e.getMessage() + " total error reported " + connection_failure);
report_error <<= 1;
}
}
}
}
public static MessagingService getInstance() { public static MessagingService getInstance() {
if (instance == null) {
instance = new MessagingService();
}
return instance; return instance;
} }