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 le...@apache.org on 2016/01/20 23:36:13 UTC
hadoop git commit: HDFS-9655. NN should start JVM pause monitor
before loading fsimage. (John Zhuge via Lei (Eddy) Xu)
Repository: hadoop
Updated Branches:
refs/heads/branch-2.8 3d38c1ef3 -> b4b546815
HDFS-9655. NN should start JVM pause monitor before loading fsimage. (John Zhuge via Lei (Eddy) Xu)
Conflicts:
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b4b54681
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b4b54681
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b4b54681
Branch: refs/heads/branch-2.8
Commit: b4b54681525a41d5ab1e4cd3c408d27654da82cb
Parents: 3d38c1e
Author: Lei Xu <le...@apache.org>
Authored: Wed Jan 20 14:26:11 2016 -0800
Committer: Lei Xu <le...@apache.org>
Committed: Wed Jan 20 14:35:59 2016 -0800
----------------------------------------------------------------------
.../main/java/org/apache/hadoop/util/JvmPauseMonitor.java | 1 +
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
.../org/apache/hadoop/hdfs/server/namenode/NameNode.java | 10 +++++-----
3 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b4b54681/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/JvmPauseMonitor.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/JvmPauseMonitor.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/JvmPauseMonitor.java
index 73d7309..72ccf9d 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/JvmPauseMonitor.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/JvmPauseMonitor.java
@@ -180,6 +180,7 @@ public class JvmPauseMonitor {
public void run() {
StopWatch sw = new StopWatch();
Map<String, GcTimes> gcTimesBeforeSleep = getGcTimes();
+ LOG.info("Starting JVM pause monitor");
while (shouldRun) {
sw.reset().start();
try {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b4b54681/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 7ef5a74..248783d 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -879,6 +879,9 @@ Release 2.8.0 - UNRELEASED
HDFS-9415. Document dfs.cluster.administrators and
dfs.permissions.superusergroup. (Xiaobing Zhou via Arpit Agarwal)
+ HDFS-9655. NN should start JVM pause monitor before loading fsimage.
+ (John Zhuge via Lei (Eddy) Xu)
+
OPTIMIZATIONS
HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b4b54681/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
index d9b5ea1..ae1c53e 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
@@ -671,6 +671,10 @@ public class NameNode implements NameNodeStatusMXBean {
NameNode.initMetrics(conf, this.getRole());
StartupProgressMetrics.register(startupProgress);
+ pauseMonitor = new JvmPauseMonitor(conf);
+ pauseMonitor.start();
+ metrics.getJvmMetrics().setPauseMonitor(pauseMonitor);
+
if (NamenodeRole.NAMENODE == role) {
startHttpServer(conf);
}
@@ -690,11 +694,7 @@ public class NameNode implements NameNodeStatusMXBean {
httpServer.setNameNodeAddress(getNameNodeAddress());
httpServer.setFSImage(getFSImage());
}
-
- pauseMonitor = new JvmPauseMonitor(conf);
- pauseMonitor.start();
- metrics.getJvmMetrics().setPauseMonitor(pauseMonitor);
-
+
startCommonServices(conf);
startMetricsLogger(conf);
}