big-data/hadoop
big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

HDFS-12247. Ozone: KeySpaceManager should unregister KSMMetrics upon stop. Contributed by Yiqun Lin.

Browse Source
This commit is contained in:
Xiaoyu Yao 2017-08-03 12:45:46 -07:00 committed by Owen O'Malley
parent 9cf40547ce
commit 37a0ab5ca3
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/ksm/KSMMetrics.java
View File

@ -32,6 +32,9 @@ import org.apache.hadoop.metrics2.lib.MutableCounterLong;
@InterfaceAudience.Private @InterfaceAudience.Private
@Metrics(about="Key Space Manager Metrics", context="dfs") @Metrics(about="Key Space Manager Metrics", context="dfs")
public class KSMMetrics { public class KSMMetrics {
private static final String SOURCE_NAME =
KSMMetrics.class.getSimpleName();
// KSM request type op metrics // KSM request type op metrics
private @Metric MutableCounterLong numVolumeOps; private @Metric MutableCounterLong numVolumeOps;
private @Metric MutableCounterLong numBucketOps; private @Metric MutableCounterLong numBucketOps;
@ -76,7 +79,7 @@ public class KSMMetrics {
public static KSMMetrics create() { public static KSMMetrics create() {
MetricsSystem ms = DefaultMetricsSystem.instance(); MetricsSystem ms = DefaultMetricsSystem.instance();
return ms.register("KSMMetrics", return ms.register(SOURCE_NAME,
"Key Space Manager Metrics", "Key Space Manager Metrics",
new KSMMetrics()); new KSMMetrics());
} }
@ -365,4 +368,9 @@ public class KSMMetrics {
public long getNumVolumeListFails() { public long getNumVolumeListFails() {
return numVolumeListFails.value(); return numVolumeListFails.value();
} }
public void unRegister() {
MetricsSystem ms = DefaultMetricsSystem.instance();
ms.unregisterSource(SOURCE_NAME);
}
} }

1
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/ksm/KeySpaceManager.java
View File

@ -229,6 +229,7 @@ public class KeySpaceManager extends ServiceRuntimeInfo
ksmRpcServer.stop(); ksmRpcServer.stop();
metadataManager.stop(); metadataManager.stop();
httpServer.stop(); httpServer.stop();
metrics.unRegister();
unregisterMXBean(); unregisterMXBean();
} catch (Exception e) { } catch (Exception e) {
LOG.error("Key Space Manager stop failed.", e); LOG.error("Key Space Manager stop failed.", e);