Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix race condition in MetricsHelper #5887

Merged
merged 1 commit into from
Aug 18, 2020
Merged

Fix race condition in MetricsHelper #5887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pinot-common/src/main/java/org/apache/pinot/common/metrics/AbstractMetrics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,7 @@ public long getValueOfTableGauge(final String tableName, final G gauge) {
*/
public void initializeGlobalMeters() {
M[] meters = getMeters();
LOGGER.info("Initializing global {} meters", meters.length);

for (M meter : meters) {
if (meter.isGlobal()) {
Expand All @@ -384,6 +385,7 @@ public void initializeGlobalMeters() {
}

G[] gauges = getGauges();
LOGGER.info("Initializing global {} gauges", gauges.length);
for (G gauge : gauges) {
if (gauge.isGlobal()) {
setValueOfGlobalGauge(gauge, 0);
Expand Down
6 changes: 6 additions & 0 deletions .../java/org/apache/pinot/common/metrics/JmxReporterMetricsRegistryRegistrationListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,21 @@

import com.yammer.metrics.core.MetricsRegistry;
import com.yammer.metrics.reporting.JmxReporter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;


/**
* Adapter that causes metrics from a metric registry to be published to JMX.
*
*/
public class JmxReporterMetricsRegistryRegistrationListener implements MetricsRegistryRegistrationListener {
private static final Logger LOGGER = LoggerFactory.getLogger(JmxReporterMetricsRegistryRegistrationListener.class);

@Override
public void onMetricsRegistryRegistered(MetricsRegistry metricsRegistry) {
LOGGER.info("Registering JmxReporterMetricsRegistryRegistrationListener");
new JmxReporter(metricsRegistry).start();
LOGGER.info("Number of metrics in metricsRegistry: {}", metricsRegistry.allMetrics().size());
}
}
15 changes: 9 additions & 6 deletions pinot-common/src/main/java/org/apache/pinot/common/metrics/MetricsHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.WeakHashMap;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
import org.apache.pinot.spi.env.PinotConfiguration;
import org.slf4j.Logger;
Expand All @@ -44,10 +44,10 @@
public class MetricsHelper {
private static final Logger LOGGER = LoggerFactory.getLogger(MetricsHelper.class);

private static Map<MetricsRegistry, Object> metricsRegistryMap = new WeakHashMap<MetricsRegistry, Object>();
private static Map<MetricsRegistry, Boolean> metricsRegistryMap = new ConcurrentHashMap<>();

private static Map<MetricsRegistryRegistrationListener, Object> metricsRegistryRegistrationListenersMap =
new WeakHashMap<MetricsRegistryRegistrationListener, Object>();
private static Map<MetricsRegistryRegistrationListener, Boolean> metricsRegistryRegistrationListenersMap =
new ConcurrentHashMap<>();

/**
* Initializes the metrics system by initializing the registry registration listeners present in the configuration.
Expand All @@ -68,13 +68,15 @@ public static void initializeMetrics(PinotConfiguration configuration) {
clazz.getDeclaredConstructor();
MetricsRegistryRegistrationListener listener = defaultConstructor.newInstance();

LOGGER.info("Registering metricsRegistry to listener {}", listenerClassName);
addMetricsRegistryRegistrationListener(listener);
} catch (Exception e) {
LOGGER
.warn("Caught exception while initializing MetricsRegistryRegistrationListener " + listenerClassName, e);
}
}
}
LOGGER.info("Number of listeners got registered: {}", metricsRegistryRegistrationListenersMap.size());
}

/**
Expand All @@ -86,10 +88,11 @@ public static void initializeMetrics(PinotConfiguration configuration) {
*/
public static void addMetricsRegistryRegistrationListener(MetricsRegistryRegistrationListener listener) {
synchronized (MetricsHelper.class) {
metricsRegistryRegistrationListenersMap.put(listener, null);
metricsRegistryRegistrationListenersMap.put(listener, Boolean.TRUE);

// Fire events to register all previously registered metrics registries
Set<MetricsRegistry> metricsRegistries = metricsRegistryMap.keySet();
LOGGER.info("Number of metrics registry: {}", metricsRegistries.size());
for (MetricsRegistry metricsRegistry : metricsRegistries) {
listener.onMetricsRegistryRegistered(metricsRegistry);
}
Expand All @@ -103,7 +106,7 @@ public static void addMetricsRegistryRegistrationListener(MetricsRegistryRegistr
*/
public static void registerMetricsRegistry(MetricsRegistry registry) {
synchronized (MetricsHelper.class) {
metricsRegistryMap.put(registry, null);
metricsRegistryMap.put(registry, Boolean.TRUE);

// Fire event to all registered listeners
Set<MetricsRegistryRegistrationListener> metricsRegistryRegistrationListeners =
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
<!-- hadoop-common, spark-core use commons-net -->
<commons-net.version>3.1</commons-net.version>
<!-- helix-core, spark-core use libraries from io.dropwizard.metrics -->
<dropwizard-metrics.version>3.2.3</dropwizard-metrics.version>
<dropwizard-metrics.version>4.1.2</dropwizard-metrics.version>
<snappy-java.version>1.1.1.7</snappy-java.version>
<log4j.version>2.11.2</log4j.version>
<netty.version>4.1.42.Final</netty.version>
Expand Down