From a42d3356db4d2743293898258c29b6e3de4d5461 Mon Sep 17 00:00:00 2001 From: Tsz-wo Sze Date: Tue, 11 Mar 2014 00:12:57 +0000 Subject: [PATCH] svn merge -c 1575021 from trunk for HDFS-6060. NameNode should not check DataNode layout version git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576149 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 ++ .../hdfs/server/namenode/NameNodeRpcServer.java | 15 --------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 419f38f723f..494967a9e99 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -643,6 +643,8 @@ HDFS-5535 subtasks: HDFS-6041. Downgrade/Finalize should rename the rollback image instead of purging it. (jing9) + HDFS-6060. NameNode should not check DataNode layout version (brandonli) + Release 2.3.1 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java index a4b7e76be7a..e973dfc63ad 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java @@ -105,7 +105,6 @@ import org.apache.hadoop.hdfs.server.blockmanagement.BlockManager; import org.apache.hadoop.hdfs.server.common.HdfsServerConstants.NamenodeRole; import org.apache.hadoop.hdfs.server.common.IncorrectVersionException; -import org.apache.hadoop.hdfs.server.datanode.DataNodeLayoutVersion; import org.apache.hadoop.hdfs.server.namenode.NameNode.OperationCategory; import org.apache.hadoop.hdfs.server.namenode.metrics.NameNodeMetrics; import org.apache.hadoop.hdfs.server.namenode.web.resources.NamenodeWebHdfsMethods; @@ -1097,20 +1096,6 @@ private void verifyRequest(NodeRegistration nodeReg) throws IOException { + " but the expected ID is " + expectedID); throw new UnregisteredNodeException(nodeReg); } - - // verify layout version if there is no rolling upgrade. - if (!namesystem.isRollingUpgrade()) { - final int lv = nodeReg.getVersion(); - final int expectedLV = nodeReg instanceof NamenodeRegistration? - NameNodeLayoutVersion.CURRENT_LAYOUT_VERSION - : DataNodeLayoutVersion.CURRENT_LAYOUT_VERSION; - if (expectedLV != nodeReg.getVersion()) { - LOG.warn("Layout versions mismatched: the " - + nodeReg.getClass().getSimpleName() + " LV is " + lv - + " but the expected LV is " + expectedLV); - throw new UnregisteredNodeException(nodeReg); - } - } }