Repository: hadoop
Updated Branches:
refs/heads/branch-2.8 cdf43bb43 -> 4bc1aab49
HDFS-9519. Some coding improvement in SecondaryNameNode#main. (Xiao Chen via
Yongjun Zhang)
(cherry picked from commit 2a4c7d4facabb8b99d6dcbf4ccfe2afedf4fd445)
Conflicts:
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6c0e36b9
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6c0e36b9
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6c0e36b9
Branch: refs/heads/branch-2.8
Commit: 6c0e36b91ccf749a83417fef4515f0d87b83215e
Parents: cdf43bb
Author: Yongjun Zhang <yzh...@cloudera.com>
Authored: Fri Dec 11 18:44:01 2015 -0800
Committer: Yongjun Zhang <yzh...@cloudera.com>
Committed: Mon Dec 14 15:40:13 2015 -0800
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
.../hdfs/server/namenode/SecondaryNameNode.java | 14 ++++++--------
2 files changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6c0e36b9/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 0991c8f..31ac661 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -850,6 +850,9 @@ Release 2.8.0 - UNRELEASED
HDFS-9535. Newly completed blocks in IBR should not be considered
under-replicated too quickly. (Mingliang Liu via jing9)
+ HDFS-9519. Some coding improvement in SecondaryNameNode#main.
+ (Xiao Chen via Yongjun Zhang)
+
OPTIMIZATIONS
HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6c0e36b9/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java
----------------------------------------------------------------------
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java
index 9909d4a..acb2c8a 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java
@@ -679,18 +679,16 @@ public class SecondaryNameNode implements Runnable,
SecondaryNameNode secondary = null;
secondary = new SecondaryNameNode(tconf, opts);
+ // SecondaryNameNode can be started in 2 modes:
+ // 1. run a command (i.e. checkpoint or geteditsize) then terminate
+ // 2. run as a daemon when {@link #parseArgs} yields no commands
if (opts != null && opts.getCommand() != null) {
+ // mode 1
int ret = secondary.processStartupCommand(opts);
terminate(ret);
- }
-
- if (secondary != null) {
- // The web server is only needed when starting SNN as a daemon,
- // and not needed if called from shell command. Starting the web server
- // from shell may fail when getting credentials, if the environment
- // is not set up for it, which is most of the case.
+ } else {
+ // mode 2
secondary.startInfoServer();
-
secondary.startCheckpointThread();
secondary.join();
}
