HDFS-2310. TestBackupNode fails since HADOOP-7524 went in. Contributed by Ivan Kelly.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1165461 13f79535-47bb-0310-9956-ffa450edef68

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

@@ -17,6 +17,8 @@ Trunk (unreleased changes)
 
     HDFS-2299. TestOfflineEditsViewer is failing on trunk. (Uma Maheswara Rao G
                via atm)
+    HDFS-2310. TestBackupNode fails since HADOOP-7524 went in.
+               (Ivan Kelly via todd)
 
 Release 0.23.0 - Unreleased
 

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/BackupNode.java

@@ -74,6 +74,7 @@ public class BackupNode extends NameNode implements JournalProtocol {
   
   BackupNode(Configuration conf, NamenodeRole role) throws IOException {
     super(conf, role);
+    this.server.addProtocol(JournalProtocol.class, this);
   }
 
   /////////////////////////////////////////////////////

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java

@@ -214,7 +214,7 @@ public class NameNode implements NamenodeProtocols {
   protected FSNamesystem namesystem; 
   protected NamenodeRole role;
   /** RPC server. Package-protected for use in tests. */
-  Server server;
+  RPC.Server server;
   /** RPC server for HDFS Services communication.
       BackupNode, Datanodes and all other services
       should be connecting to this server if it is