Remove unnecessary quadratic algorithm from MetricsMBean.register
Before this change it was taking JMX Server 270 seconds to start when Scylla had 2000 tables. After the change it takes only 2 seconds. Signed-off-by: Piotr Jastrzebski <piotr@scylladb.com>
This commit is contained in:
parent
455f5717ea
commit
5cba016962
|
@ -3,6 +3,11 @@ package com.scylladb.jmx.metrics;
|
||||||
import static java.util.Arrays.asList;
|
import static java.util.Arrays.asList;
|
||||||
|
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Set;
|
||||||
import java.util.function.Predicate;
|
import java.util.function.Predicate;
|
||||||
import java.util.function.Supplier;
|
import java.util.function.Supplier;
|
||||||
|
|
||||||
|
@ -25,6 +30,9 @@ import com.sun.jmx.mbeanserver.JmxMBeanServer;
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public abstract class MetricsMBean extends APIMBean {
|
public abstract class MetricsMBean extends APIMBean {
|
||||||
|
private static final Map<JmxMBeanServer, Map<String, Integer>> registered = new HashMap<>();
|
||||||
|
private static final Object registrationLock = new Object();
|
||||||
|
|
||||||
private final Collection<Metrics> metrics;
|
private final Collection<Metrics> metrics;
|
||||||
|
|
||||||
public MetricsMBean(APIClient client, Metrics... metrics) {
|
public MetricsMBean(APIClient client, Metrics... metrics) {
|
||||||
|
@ -48,13 +56,50 @@ public abstract class MetricsMBean extends APIMBean {
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
private void register(MetricsRegistry registry, JmxMBeanServer server) throws MalformedObjectNameException {
|
// Has to be called with registrationLock hold
|
||||||
// Check if we're the first/last of our type bound/removed.
|
private static boolean shouldRegisterGlobals(JmxMBeanServer server, String domainAndType, boolean reversed) {
|
||||||
boolean empty = queryNames(server, getTypePredicate()).isEmpty();
|
Map<String, Integer> serverMap = registered.get(server);
|
||||||
for (Metrics m : metrics) {
|
if (serverMap == null) {
|
||||||
if (empty) {
|
assert !reversed;
|
||||||
m.registerGlobals(registry);
|
serverMap = new HashMap<>();
|
||||||
|
serverMap.put(domainAndType, 1);
|
||||||
|
registered.put(server, serverMap);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
Integer count = serverMap.get(domainAndType);
|
||||||
|
if (count == null) {
|
||||||
|
assert !reversed;
|
||||||
|
serverMap.put(domainAndType, 1);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (reversed) {
|
||||||
|
--count;
|
||||||
|
if (count == 0) {
|
||||||
|
serverMap.remove(domainAndType);
|
||||||
|
if (serverMap.isEmpty()) {
|
||||||
|
registered.remove(server);
|
||||||
|
}
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
serverMap.put(domainAndType, count);
|
||||||
|
return false;
|
||||||
|
} else {
|
||||||
|
serverMap.put(domainAndType, count + 1);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void register(MetricsRegistry registry, JmxMBeanServer server, boolean reversed) throws MalformedObjectNameException {
|
||||||
|
// Check if we're the first/last of our type bound/removed.
|
||||||
|
synchronized (registrationLock) {
|
||||||
|
boolean registerGlobals = shouldRegisterGlobals(server, name.getDomain() + ":" + name.getKeyProperty("type"), reversed);
|
||||||
|
if (registerGlobals) {
|
||||||
|
for (Metrics m : metrics) {
|
||||||
|
m.registerGlobals(registry);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for (Metrics m : metrics) {
|
||||||
m.register(registry);
|
m.register(registry);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -64,7 +109,7 @@ public abstract class MetricsMBean extends APIMBean {
|
||||||
// Get name etc.
|
// Get name etc.
|
||||||
name = super.preRegister(server, name);
|
name = super.preRegister(server, name);
|
||||||
// Register all metrics in server
|
// Register all metrics in server
|
||||||
register(new MetricsRegistry(client, (JmxMBeanServer) server), (JmxMBeanServer) server);
|
register(new MetricsRegistry(client, (JmxMBeanServer) server), (JmxMBeanServer) server, false);
|
||||||
return name;
|
return name;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -83,7 +128,7 @@ public abstract class MetricsMBean extends APIMBean {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}, server);
|
}, server, true);
|
||||||
} catch (MalformedObjectNameException e) {
|
} catch (MalformedObjectNameException e) {
|
||||||
// TODO : log?
|
// TODO : log?
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user