hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From whe...@apache.org
Subject hadoop git commit: HDFS-7897. Shutdown metrics when stopping JournalNode. Contributed by zhouyingchao.
Date Mon, 23 Nov 2015 03:14:19 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 afac7a264 -> 529103c51


HDFS-7897. Shutdown metrics when stopping JournalNode. Contributed by zhouyingchao.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/529103c5
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/529103c5
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/529103c5

Branch: refs/heads/branch-2
Commit: 529103c51f64d60657a60d73d88ca47c285bcca6
Parents: afac7a2
Author: Haohui Mai <wheat9@apache.org>
Authored: Sun Nov 22 19:12:23 2015 -0800
Committer: Haohui Mai <wheat9@apache.org>
Committed: Sun Nov 22 19:12:32 2015 -0800

----------------------------------------------------------------------
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt                       | 3 +++
 .../java/org/apache/hadoop/hdfs/qjournal/server/JournalNode.java  | 2 ++
 2 files changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/529103c5/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index fb194de..194fb8c 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1490,6 +1490,9 @@ Release 2.8.0 - UNRELEASED
     HDFS-6885. Fix wrong use of BytesWritable in FSEditLogOp#RenameOp.
     (Yi Liu via wheat9)
 
+    HDFS-7897. Shutdown metrics when stopping JournalNode.
+    (zhouyingchao via wheat9)
+
 Release 2.7.3 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/529103c5/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNode.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNode.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNode.java
index fae78ae..39a8034 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNode.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNode.java
@@ -207,6 +207,8 @@ public class JournalNode implements Tool, Configurable, JournalNodeMXBean
{
       IOUtils.cleanup(LOG, j);
     }
 
+    DefaultMetricsSystem.shutdown();
+
     if (journalNodeInfoBeanName != null) {
       MBeans.unregister(journalNodeInfoBeanName);
       journalNodeInfoBeanName = null;


Mime
View raw message