You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by aa...@apache.org on 2019/07/30 00:42:46 UTC
[hadoop] branch branch-2.9 updated: HADOOP-16435. RpcMetrics should
not retained forever. Contributed by Zoltan Haindrich.
This is an automated email from the ASF dual-hosted git repository.
aajisaka pushed a commit to branch branch-2.9
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-2.9 by this push:
new 00450e2 HADOOP-16435. RpcMetrics should not retained forever. Contributed by Zoltan Haindrich.
00450e2 is described below
commit 00450e2bb5a530943275c18c097d4d300169cca6
Author: Akira Ajisaka <aa...@apache.org>
AuthorDate: Mon Jul 29 17:37:26 2019 -0700
HADOOP-16435. RpcMetrics should not retained forever. Contributed by Zoltan Haindrich.
(cherry picked from commit cbfa3f3e988b8a3f142abadfe4f18201b6438ac9)
(cherry picked from commit 46c00aca2176400d1ba77f8af7756303b5826888)
---
.../hadoop/ipc/metrics/RpcDetailedMetrics.java | 4 +-
.../org/apache/hadoop/ipc/metrics/RpcMetrics.java | 4 +-
.../apache/hadoop/ipc/metrics/TestRpcMetrics.java | 60 ++++++++++++++++++++++
3 files changed, 66 insertions(+), 2 deletions(-)
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/RpcDetailedMetrics.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/RpcDetailedMetrics.java
index 6ed57ec..e50895b 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/RpcDetailedMetrics.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/RpcDetailedMetrics.java
@@ -82,5 +82,7 @@ public class RpcDetailedMetrics {
* Shutdown the instrumentation for the process
*/
//@Override // some instrumentation interface
- public void shutdown() {}
+ public void shutdown() {
+ DefaultMetricsSystem.instance().unregisterSource(name);
+ }
}
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/RpcMetrics.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/RpcMetrics.java
index d53d7d3..81e6893 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/RpcMetrics.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/RpcMetrics.java
@@ -166,7 +166,9 @@ public class RpcMetrics {
* Shutdown the instrumentation for the process
*/
//@Override
- public void shutdown() {}
+ public void shutdown() {
+ DefaultMetricsSystem.instance().unregisterSource(name);
+ }
/**
* Increment sent bytes by count
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/metrics/TestRpcMetrics.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/metrics/TestRpcMetrics.java
new file mode 100644
index 0000000..1716433
--- /dev/null
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/metrics/TestRpcMetrics.java
@@ -0,0 +1,60 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.ipc.metrics;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.io.LongWritable;
+import org.apache.hadoop.io.Writable;
+import org.apache.hadoop.ipc.RPC;
+import org.apache.hadoop.ipc.Server;
+import org.apache.hadoop.metrics2.MetricsSystem;
+import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
+import org.junit.Test;
+
+public class TestRpcMetrics {
+
+ @Test
+ public void metricsAreUnregistered() throws Exception {
+
+ Configuration conf = new Configuration();
+ Server server = new Server("0.0.0.0", 0, LongWritable.class, 1, conf) {
+ @Override
+ public Writable call(
+ RPC.RpcKind rpcKind, String protocol, Writable param,
+ long receiveTime) throws Exception {
+ return null;
+ }
+ };
+ MetricsSystem metricsSystem = DefaultMetricsSystem.instance();
+ RpcMetrics rpcMetrics = server.getRpcMetrics();
+ RpcDetailedMetrics rpcDetailedMetrics = server.getRpcDetailedMetrics();
+
+ assertNotNull(metricsSystem.getSource(rpcMetrics.name()));
+ assertNotNull(metricsSystem.getSource(rpcDetailedMetrics.name()));
+
+ server.stop();
+
+ assertNull(metricsSystem.getSource(rpcMetrics.name()));
+ assertNull(metricsSystem.getSource(rpcDetailedMetrics.name()));
+
+ }
+
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org