Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1BECD18EDA for ; Mon, 11 May 2015 15:19:42 +0000 (UTC) Received: (qmail 84823 invoked by uid 500); 11 May 2015 15:19:41 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 84755 invoked by uid 500); 11 May 2015 15:19:41 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 84746 invoked by uid 99); 11 May 2015 15:19:41 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 May 2015 15:19:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BC5E4E045C; Mon, 11 May 2015 15:19:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aajisaka@apache.org To: common-commits@hadoop.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: HDFS-8241. Remove unused NameNode startup option -finalize. Contributed by Brahma Reddy Battula. Date: Mon, 11 May 2015 15:19:41 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/trunk 7e543c27f -> 1dd79ffac HDFS-8241. Remove unused NameNode startup option -finalize. Contributed by Brahma Reddy Battula. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1dd79ffa Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1dd79ffa Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1dd79ffa Branch: refs/heads/trunk Commit: 1dd79ffaca4b0c2cb0ab817dff3697686f3367e3 Parents: 7e543c2 Author: Akira Ajisaka Authored: Tue May 12 00:18:18 2015 +0900 Committer: Akira Ajisaka Committed: Tue May 12 00:18:18 2015 +0900 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../hadoop/hdfs/server/common/HdfsServerConstants.java | 1 - .../apache/hadoop/hdfs/server/namenode/NameNode.java | 12 ------------ .../hadoop-hdfs/src/site/markdown/HDFSCommands.md | 4 +--- .../hdfs/server/datanode/TestHdfsServerConstants.java | 1 - 5 files changed, 4 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/1dd79ffa/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 6b53e88..8060644 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -25,6 +25,9 @@ Trunk (Unreleased) HDFS-8349. Remove .xml and documentation references to dfs.webhdfs.enabled. (Ray Chiang via aajisaka) + + HDFS-8241. Remove unused NameNode startup option -finalize. + (Brahma Reddy Battula via aajisaka) NEW FEATURES http://git-wip-us.apache.org/repos/asf/hadoop/blob/1dd79ffa/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/HdfsServerConstants.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/HdfsServerConstants.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/HdfsServerConstants.java index 31af6c8..c664b01 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/HdfsServerConstants.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/HdfsServerConstants.java @@ -155,7 +155,6 @@ public interface HdfsServerConstants { CHECKPOINT("-checkpoint"), UPGRADE ("-upgrade"), ROLLBACK("-rollback"), - FINALIZE("-finalize"), ROLLINGUPGRADE("-rollingUpgrade"), IMPORT ("-importCheckpoint"), BOOTSTRAPSTANDBY("-bootstrapStandby"), http://git-wip-us.apache.org/repos/asf/hadoop/blob/1dd79ffa/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 979378a..1c1032b 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 @@ -262,7 +262,6 @@ public class NameNode implements NameNodeStatusMXBean { + StartupOption.ROLLBACK.getName() + "] | \n\t[" + StartupOption.ROLLINGUPGRADE.getName() + " " + RollingUpgradeStartupOption.getAllOptionString() + " ] | \n\t[" - + StartupOption.FINALIZE.getName() + "] | \n\t[" + StartupOption.IMPORT.getName() + "] | \n\t[" + StartupOption.INITIALIZESHAREDEDITS.getName() + "] | \n\t[" + StartupOption.BOOTSTRAPSTANDBY.getName() + "] | \n\t[" @@ -778,8 +777,6 @@ public class NameNode implements NameNodeStatusMXBean { * metadata *
  • {@link StartupOption#ROLLBACK ROLLBACK} - roll the * cluster back to the previous state
    • - *
  • {@link StartupOption#FINALIZE FINALIZE} - finalize - * previous upgrade
    • *
  • {@link StartupOption#IMPORT IMPORT} - import checkpoint
    • * * The option is passed via configuration field: @@ -1306,8 +1303,6 @@ public class NameNode implements NameNodeStatusMXBean { startOpt.setRollingUpgradeStartupOption(args[i]); } else if (StartupOption.ROLLBACK.getName().equalsIgnoreCase(cmd)) { startOpt = StartupOption.ROLLBACK; - } else if (StartupOption.FINALIZE.getName().equalsIgnoreCase(cmd)) { - startOpt = StartupOption.FINALIZE; } else if (StartupOption.IMPORT.getName().equalsIgnoreCase(cmd)) { startOpt = StartupOption.IMPORT; } else if (StartupOption.BOOTSTRAPSTANDBY.getName().equalsIgnoreCase(cmd)) { @@ -1442,13 +1437,6 @@ public class NameNode implements NameNodeStatusMXBean { terminate(0); return null; } - case FINALIZE: { - System.err.println("Use of the argument '" + StartupOption.FINALIZE + - "' is no longer supported. To finalize an upgrade, start the NN " + - " and then run `hdfs dfsadmin -finalizeUpgrade'"); - terminate(1); - return null; // avoid javac warning - } case ROLLBACK: { boolean aborted = doRollback(conf, true); terminate(aborted ? 1 : 0); http://git-wip-us.apache.org/repos/asf/hadoop/blob/1dd79ffa/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSCommands.md ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSCommands.md b/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSCommands.md index 534d63a..2ceff89 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSCommands.md +++ b/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSCommands.md @@ -416,7 +416,6 @@ Usage: [-upgradeOnly [-clusterid cid] [-renameReserved] ] | [-rollback] | [-rollingUpgrade ] | - [-finalize] | [-importCheckpoint] | [-initializeSharedEdits] | [-bootstrapStandby] | @@ -432,14 +431,13 @@ Usage: | `-upgradeOnly` `[-clusterid cid]` [`-renameReserved` \] | Upgrade the specified NameNode and then shutdown it. | | `-rollback` | Rollback the NameNode to the previous version. This should be used after stopping the cluster and distributing the old Hadoop version. | | `-rollingUpgrade` \ | See [Rolling Upgrade document](./HdfsRollingUpgrade.html#NameNode_Startup_Options) for the detail. | -| `-finalize` | No longer supported. Use `dfsadmin -finalizeUpgrade` instead. | | `-importCheckpoint` | Loads image from a checkpoint directory and save it into the current one. Checkpoint dir is read from property fs.checkpoint.dir | | `-initializeSharedEdits` | Format a new shared edits dir and copy in enough edit log segments so that the standby NameNode can start up. | | `-bootstrapStandby` | Allows the standby NameNode's storage directories to be bootstrapped by copying the latest namespace snapshot from the active NameNode. This is used when first configuring an HA cluster. | | `-recover` `[-force]` | Recover lost metadata on a corrupt filesystem. See [HDFS User Guide](./HdfsUserGuide.html#Recovery_Mode) for the detail. | | `-metadataVersion` | Verify that configured directories exist, then print the metadata versions of the software and the image. | -Runs the namenode. More info about the upgrade, rollback and finalize is at [Upgrade Rollback](./HdfsUserGuide.html#Upgrade_and_Rollback). +Runs the namenode. More info about the upgrade and rollback is at [Upgrade Rollback](./HdfsUserGuide.html#Upgrade_and_Rollback). ### `nfs3` http://git-wip-us.apache.org/repos/asf/hadoop/blob/1dd79ffa/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestHdfsServerConstants.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestHdfsServerConstants.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestHdfsServerConstants.java index 0f24c05..0d359d8 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestHdfsServerConstants.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestHdfsServerConstants.java @@ -61,7 +61,6 @@ public class TestHdfsServerConstants { verifyStartupOptionResult("CHECKPOINT", StartupOption.CHECKPOINT, null); verifyStartupOptionResult("UPGRADE", StartupOption.UPGRADE, null); verifyStartupOptionResult("ROLLBACK", StartupOption.ROLLBACK, null); - verifyStartupOptionResult("FINALIZE", StartupOption.FINALIZE, null); verifyStartupOptionResult("ROLLINGUPGRADE", StartupOption.ROLLINGUPGRADE, null); verifyStartupOptionResult("IMPORT", StartupOption.IMPORT, null); verifyStartupOptionResult("INITIALIZESHAREDEDITS", StartupOption.INITIALIZESHAREDEDITS, null);