svn commit: r1576150 - in /hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs: ./ CHANGES.txt src/main/java/ src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java

[szetszwo]

Author: szetszwo
Date: Tue Mar 11 00:18:58 2014
New Revision: 1576150

URL: http://svn.apache.org/r1576150
Log:
svn merge -c 1576149 from branch-2 for HDFS-6060. NameNode should not check 
DataNode layout version

Modified:
    hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/   (props 
changed)
    
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
    
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/main/java/
   (props changed)
    
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java

Propchange: hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/
------------------------------------------------------------------------------
  Merged 
/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs:r1576149
  Merged /hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs:r1575021

Modified: 
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1576150&r1=1576149&r2=1576150&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt 
(original)
+++ 
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt 
Tue Mar 11 00:18:58 2014
@@ -627,6 +627,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

Propchange: 
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/main/java/
------------------------------------------------------------------------------
  Merged 
/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java:r1576149
  Merged 
/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java:r1575021

Modified: 
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java?rev=1576150&r1=1576149&r2=1576150&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
 (original)
+++ 
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
 Tue Mar 11 00:18:58 2014
@@ -105,7 +105,6 @@ import org.apache.hadoop.hdfs.security.t
 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 @@ class NameNodeRpcServer implements Namen
           + " 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);
-      }
-    }
   }