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 xg...@apache.org on 2017/02/22 00:06:39 UTC
[11/50] [abbrv] hadoop git commit: HDFS-11238. Fix checkstyle
warnings in NameNode#createNameNode. Contributed by Ethan Li.
HDFS-11238. Fix checkstyle warnings in NameNode#createNameNode. Contributed by Ethan Li.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8acb376c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8acb376c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8acb376c
Branch: refs/heads/YARN-5734
Commit: 8acb376c9c5f7f52a097be221ed18877a403bece
Parents: 1e11080
Author: Akira Ajisaka <aa...@apache.org>
Authored: Wed Feb 15 16:53:50 2017 +0900
Committer: Akira Ajisaka <aa...@apache.org>
Committed: Wed Feb 15 16:53:50 2017 +0900
----------------------------------------------------------------------
.../hadoop/hdfs/server/namenode/NameNode.java | 101 +++++++++----------
1 file changed, 46 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8acb376c/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 df5ee0f..1752cf7 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
@@ -1579,62 +1579,53 @@ public class NameNode extends ReconfigurableBase implements
}
setStartupOption(conf, startOpt);
+ boolean aborted = false;
switch (startOpt) {
- case FORMAT: {
- boolean aborted = format(conf, startOpt.getForceFormat(),
- startOpt.getInteractiveFormat());
- terminate(aborted ? 1 : 0);
- return null; // avoid javac warning
- }
- case GENCLUSTERID: {
- System.err.println("Generating new cluster id:");
- System.out.println(NNStorage.newClusterID());
- terminate(0);
- return null;
- }
- case ROLLBACK: {
- boolean aborted = doRollback(conf, true);
- terminate(aborted ? 1 : 0);
- return null; // avoid warning
- }
- case BOOTSTRAPSTANDBY: {
- String toolArgs[] = Arrays.copyOfRange(argv, 1, argv.length);
- int rc = BootstrapStandby.run(toolArgs, conf);
- terminate(rc);
- return null; // avoid warning
- }
- case INITIALIZESHAREDEDITS: {
- boolean aborted = initializeSharedEdits(conf,
- startOpt.getForceFormat(),
- startOpt.getInteractiveFormat());
- terminate(aborted ? 1 : 0);
- return null; // avoid warning
- }
- case BACKUP:
- case CHECKPOINT: {
- NamenodeRole role = startOpt.toNodeRole();
- DefaultMetricsSystem.initialize(role.toString().replace(" ", ""));
- return new BackupNode(conf, role);
- }
- case RECOVER: {
- NameNode.doRecovery(startOpt, conf);
- return null;
- }
- case METADATAVERSION: {
- printMetadataVersion(conf);
- terminate(0);
- return null; // avoid javac warning
- }
- case UPGRADEONLY: {
- DefaultMetricsSystem.initialize("NameNode");
- new NameNode(conf);
- terminate(0);
- return null;
- }
- default: {
- DefaultMetricsSystem.initialize("NameNode");
- return new NameNode(conf);
- }
+ case FORMAT:
+ aborted = format(conf, startOpt.getForceFormat(),
+ startOpt.getInteractiveFormat());
+ terminate(aborted ? 1 : 0);
+ return null; // avoid javac warning
+ case GENCLUSTERID:
+ System.err.println("Generating new cluster id:");
+ System.out.println(NNStorage.newClusterID());
+ terminate(0);
+ return null;
+ case ROLLBACK:
+ aborted = doRollback(conf, true);
+ terminate(aborted ? 1 : 0);
+ return null; // avoid warning
+ case BOOTSTRAPSTANDBY:
+ String[] toolArgs = Arrays.copyOfRange(argv, 1, argv.length);
+ int rc = BootstrapStandby.run(toolArgs, conf);
+ terminate(rc);
+ return null; // avoid warning
+ case INITIALIZESHAREDEDITS:
+ aborted = initializeSharedEdits(conf,
+ startOpt.getForceFormat(),
+ startOpt.getInteractiveFormat());
+ terminate(aborted ? 1 : 0);
+ return null; // avoid warning
+ case BACKUP:
+ case CHECKPOINT:
+ NamenodeRole role = startOpt.toNodeRole();
+ DefaultMetricsSystem.initialize(role.toString().replace(" ", ""));
+ return new BackupNode(conf, role);
+ case RECOVER:
+ NameNode.doRecovery(startOpt, conf);
+ return null;
+ case METADATAVERSION:
+ printMetadataVersion(conf);
+ terminate(0);
+ return null; // avoid javac warning
+ case UPGRADEONLY:
+ DefaultMetricsSystem.initialize("NameNode");
+ new NameNode(conf);
+ terminate(0);
+ return null;
+ default:
+ DefaultMetricsSystem.initialize("NameNode");
+ return new NameNode(conf);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org