svn merge -c 1188436 from trunk for HDFS-2497.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1229491 13f79535-47bb-0310-9956-ffa450edef68

hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

@@ -24,6 +24,8 @@ Release 0.23-PB - Unreleased
 
     HDFS-2481 Unknown protocol: org.apache.hadoop.hdfs.protocol.ClientProtocol (sanjay)
 
+    HDFS-2497 Fix TestBackupNode failure. (suresh)
+
 Release 0.23.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolR23Compatible/NamenodeRegistrationWritable.java

@@ -82,13 +82,13 @@ public class NamenodeRegistrationWritable implements Writable {
     rpcAddress = Text.readString(in);
     httpAddress = Text.readString(in);
     role = NamenodeRole.valueOf(Text.readString(in));
+    storageInfo = new StorageInfoWritable();
     storageInfo.readFields(in);
   }
 
   public static NamenodeRegistrationWritable convert(NamenodeRegistration reg) {
     return new NamenodeRegistrationWritable(reg.getAddress(),
-        reg.getHttpAddress(), reg.getRole(),
-        reg);
+        reg.getHttpAddress(), reg.getRole(), reg);
   }
 
   public NamenodeRegistration convert() {