YARN-5296. NMs going OutOfMemory because ContainerMetrics leak in ContainerMonitorImpl. Contributed by Junping Du
(cherry picked from commit d792a90206
)
This commit is contained in:
parent
56a08983e2
commit
46f8204992
|
@ -23,6 +23,7 @@ import static org.apache.hadoop.metrics2.lib.Interns.info;
|
|||
import java.util.Map;
|
||||
import java.util.concurrent.Executors;
|
||||
import java.util.concurrent.ScheduledExecutorService;
|
||||
import java.util.concurrent.ScheduledFuture;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
|
@ -57,6 +58,7 @@ public class MutableQuantiles extends MutableMetric {
|
|||
|
||||
private QuantileEstimator estimator;
|
||||
private long previousCount = 0;
|
||||
private ScheduledFuture<?> scheduledTask = null;
|
||||
|
||||
@VisibleForTesting
|
||||
protected Map<Quantile, Long> previousSnapshot = null;
|
||||
|
@ -105,8 +107,8 @@ public class MutableQuantiles extends MutableMetric {
|
|||
estimator = new SampleQuantiles(quantiles);
|
||||
|
||||
this.interval = interval;
|
||||
scheduler.scheduleAtFixedRate(new RolloverSample(this), interval, interval,
|
||||
TimeUnit.SECONDS);
|
||||
scheduledTask = scheduler.scheduleAtFixedRate(new RolloverSample(this),
|
||||
interval, interval, TimeUnit.SECONDS);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -135,6 +137,13 @@ public class MutableQuantiles extends MutableMetric {
|
|||
return interval;
|
||||
}
|
||||
|
||||
public void stop() {
|
||||
if (scheduledTask != null) {
|
||||
scheduledTask.cancel(false);
|
||||
}
|
||||
scheduledTask = null;
|
||||
}
|
||||
|
||||
public synchronized void setEstimator(QuantileEstimator quantileEstimator) {
|
||||
this.estimator = quantileEstimator;
|
||||
}
|
||||
|
|
|
@ -250,6 +250,8 @@ public class ContainerMetrics implements MetricsSource {
|
|||
timer = null;
|
||||
}
|
||||
scheduleTimerTaskForUnregistration();
|
||||
this.pMemMBQuantiles.stop();
|
||||
this.cpuCoreUsagePercentQuantiles.stop();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue