mirrors/nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus synced 2026-08-01 12:56:06 +00:00
Code Issues Releases Wiki Activity

Improve service handling and add unit tests for threading behavior in MetricExporter

Browse Source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=130790170
This commit is contained in:
shikhman
2016-08-22 14:43:05 -04:00
committed by Ben McIlwain
parent 6915e35800
commit b6eaba08eb
2 changed files with 56 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/google/registry/monitoring/metrics/MetricReporter.java
+25 -12
View File
@@ -121,12 +121,18 @@ public class MetricReporter extends AbstractScheduledService {
// least once.
runOneIteration();
// Offer a poision pill to inform the exporter to stop.
writeQueue.offer(Optional.<ImmutableList<MetricPoint<?>>>absent());
try {
metricExporter.stopAsync().awaitTerminated(10, TimeUnit.SECONDS);
metricExporter.awaitTerminated(10, TimeUnit.SECONDS);
logger.info("Shut down MetricExporter");
} catch (TimeoutException timeoutException) {
logger.severe("Failed to shut down MetricExporter: " + timeoutException);
} catch (IllegalStateException exception) {
logger.log(
Level.SEVERE,
"Failed to shut down MetricExporter because it was FAILED",
metricExporter.failureCause());
} catch (TimeoutException exception) {
logger.log(Level.SEVERE, "Failed to shut down MetricExporter within the timeout", exception);
}
}
@@ -145,6 +151,7 @@ public class MetricReporter extends AbstractScheduledService {
protected ScheduledExecutorService executor() {
final ScheduledExecutorService executor =
Executors.newSingleThreadScheduledExecutor(threadFactory);
// Make sure the ExecutorService terminates when this service does.
addListener(
new Listener() {
@Override
@@ -162,15 +169,21 @@ public class MetricReporter extends AbstractScheduledService {
}
private void startMetricExporter() {
// Services in the FAILED state must be reconstructed, they can't be started
if (metricExporter.state() == State.FAILED) {
logger.log(
Level.SEVERE,
"MetricExporter died unexpectedly, restarting",
metricExporter.failureCause());
this.metricExporter = new MetricExporter(writeQueue, metricWriter, threadFactory);
switch (metricExporter.state()) {
case NEW:
metricExporter.startAsync();
break;
case FAILED:
logger.log(
Level.SEVERE,
"MetricExporter died unexpectedly, restarting",
metricExporter.failureCause());
this.metricExporter = new MetricExporter(writeQueue, metricWriter, threadFactory);
this.metricExporter.startAsync();
break;
default:
throw new IllegalStateException(
"MetricExporter not FAILED or NEW, should not be calling startMetricExporter");
}
this.metricExporter.startAsync();
}
}