Skip to content

[HUDI-1326] Added an API to force publish metrics and flush them. #2152

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

Merged
vinothchandar merged 2 commits into from
Oct 24, 2020
Merged

[HUDI-1326] Added an API to force publish metrics and flush them. #2152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
306bf62
[HUDI-1326] Added an API to force publish metrics and flush them.
prashantwason Oct 8, 2020
cd02a8b
Code cleanups
vinothchandar Oct 24, 2020
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
32 changes: 26 additions & 6 deletions hudi-client/hudi-client-common/src/main/java/org/apache/hudi/metrics/Metrics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,15 @@ public class Metrics {
private static final Logger LOG = LogManager.getLogger(Metrics.class);

private static volatile boolean initialized = false;
private static Metrics metrics = null;
private static Metrics instance = null;

private final MetricRegistry registry;
private MetricsReporter reporter;
private final String commonMetricPrefix;

private Metrics(HoodieWriteConfig metricConfig) {
registry = new MetricRegistry();

commonMetricPrefix = metricConfig.getTableName();
reporter = MetricsReporterFactory.createReporter(metricConfig, registry);
if (reporter == null) {
throw new RuntimeException("Cannot initialize Reporter.");
Expand All @@ -68,21 +70,32 @@ private void reportAndCloseReporter() {
}
}

private void reportAndFlushMetrics() {
try {
LOG.info("Reporting and flushing all metrics");
this.registerHoodieCommonMetrics();
this.reporter.report();
this.registry.getNames().forEach(this.registry::remove);
} catch (Exception e) {
LOG.error("Error while reporting and flushing metrics", e);
}
}

private void registerHoodieCommonMetrics() {
registerGauges(Registry.getAllMetrics(true, true), Option.empty());
registerGauges(Registry.getAllMetrics(true, true), Option.of(commonMetricPrefix));
}

public static Metrics getInstance() {
assert initialized;
return metrics;
return instance;
}

public static synchronized void init(HoodieWriteConfig metricConfig) {
if (initialized) {
return;
}
try {
metrics = new Metrics(metricConfig);
instance = new Metrics(metricConfig);
} catch (Exception e) {
throw new HoodieException(e);
}
Expand All @@ -93,10 +106,17 @@ public static synchronized void shutdown() {
if (!initialized) {
return;
}
metrics.reportAndCloseReporter();
instance.reportAndCloseReporter();
initialized = false;
}

public static synchronized void flush() {
if (!Metrics.initialized) {
return;
Copy link
Contributor

@n3nash n3nash Oct 9, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What should be the right expectation if it's not initialized ? Simply returning gives a false impression to the client that it's flushed.

Copy link
Member Author

@prashantwason prashantwason Oct 22, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is inline with the shutdown() and init() functions which are fail-safe. Unless metrics are initialized there is no effect of calling these.

}
instance.reportAndFlushMetrics();
}

public static void registerGauges(Map<String, Long> metricsMap, Option<String> prefix) {
String metricPrefix = prefix.isPresent() ? prefix.get() + "." : "";
metricsMap.forEach((k, v) -> registerGauge(metricPrefix + k, v));
Expand Down
4 changes: 4 additions & 0 deletions ...-integ-test/src/main/java/org/apache/hudi/integ/testsuite/dag/scheduler/DagScheduler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import java.util.concurrent.TimeUnit;
import org.apache.hudi.exception.HoodieException;
import org.apache.hudi.integ.testsuite.dag.nodes.DagNode;
import org.apache.hudi.metrics.Metrics;
import org.apache.hudi.integ.testsuite.dag.ExecutionContext;
import org.apache.hudi.integ.testsuite.dag.WorkflowDag;
import org.apache.hudi.integ.testsuite.dag.WriterContext;
Expand Down Expand Up @@ -95,6 +96,9 @@ private void execute(ExecutorService service, List<DagNode> nodes) throws Except
for (Future future : futures) {
future.get(1, TimeUnit.HOURS);
}

// After each level, report and flush the metrics
Metrics.flush();
} while (queue.size() > 0);
log.info("Finished workloads");
}
Expand Down