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 ka...@apache.org on 2016/01/25 18:25:42 UTC
[07/50] [abbrv] hadoop git commit: HDFS-9655. NN should start JVM
pause monitor before loading fsimage. (John Zhuge via Lei (Eddy) Xu)
HDFS-9655. NN should start JVM pause monitor before loading fsimage. (John Zhuge via Lei (Eddy) Xu)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2ec438e8
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2ec438e8
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2ec438e8
Branch: refs/heads/YARN-1011
Commit: 2ec438e8f7cd77cb48fd1264781e60a48e331908
Parents: 7905788
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:26:11 2016 -0800
----------------------------------------------------------------------
.../java/org/apache/hadoop/util/JvmPauseMonitor.java | 1 +
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
.../apache/hadoop/hdfs/server/namenode/NameNode.java | 12 ++++++------
3 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2ec438e8/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 882e4a7..17a1952 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
@@ -185,6 +185,7 @@ public class JvmPauseMonitor extends AbstractService {
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/2ec438e8/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 7a5290e..e6022fe 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1822,6 +1822,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/2ec438e8/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 97c8b26..7c4e10f 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,11 @@ public class NameNode implements NameNodeStatusMXBean {
NameNode.initMetrics(conf, this.getRole());
StartupProgressMetrics.register(startupProgress);
+ pauseMonitor = new JvmPauseMonitor();
+ pauseMonitor.init(conf);
+ pauseMonitor.start();
+ metrics.getJvmMetrics().setPauseMonitor(pauseMonitor);
+
if (NamenodeRole.NAMENODE == role) {
startHttpServer(conf);
}
@@ -690,12 +695,7 @@ public class NameNode implements NameNodeStatusMXBean {
httpServer.setNameNodeAddress(getNameNodeAddress());
httpServer.setFSImage(getFSImage());
}
-
- pauseMonitor = new JvmPauseMonitor();
- pauseMonitor.init(conf);
- pauseMonitor.start();
- metrics.getJvmMetrics().setPauseMonitor(pauseMonitor);
-
+
startCommonServices(conf);
startMetricsLogger(conf);
}