HDFS-500. Deprecate NameNode methods deprecated in NameNodeProtocol. Contributed by Jakob Homan.

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

CHANGES.txt

@@ -57,6 +57,9 @@ Trunk (unreleased changes)
     HDFS-510. Rename DatanodeBlockInfo to be ReplicaInfo.
     (Jakob Homan & Hairong Kuang via shv)
 
+    HDFS-500. Deprecate NameNode methods deprecated in NameNodeProtocol.
+    (Jakob Homan via shv)
+
   BUG FIXES
     HDFS-76. Better error message to users when commands fail because of 
     lack of quota. Allow quota to be set even if the limit is lower than

src/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java

@@ -818,6 +818,7 @@ public class NameNode implements ClientProtocol, DatanodeProtocol,
   /**
    * Returns the size of the current edit log.
    */
+  @Deprecated
   public long getEditLogSize() throws IOException {
     return namesystem.getEditLogSize();
   }
@@ -825,6 +826,7 @@ public class NameNode implements ClientProtocol, DatanodeProtocol,
   /**
    * Roll the edit log.
    */
+  @Deprecated
   public CheckpointSignature rollEditLog() throws IOException {
     return namesystem.rollEditLog();
   }
@@ -832,6 +834,7 @@ public class NameNode implements ClientProtocol, DatanodeProtocol,
   /**
    * Roll the image 
    */
+  @Deprecated
   public void rollFsImage() throws IOException {
     namesystem.rollFSImage();
   }
@@ -1150,9 +1153,11 @@ public class NameNode implements ClientProtocol, DatanodeProtocol,
       case FORMAT:
         boolean aborted = format(conf, true);
         System.exit(aborted ? 1 : 0);
+        return null; // avoid javac warning
       case FINALIZE:
         aborted = finalize(conf, true);
         System.exit(aborted ? 1 : 0);
+        return null; // avoid javac warning
       case BACKUP:
       case CHECKPOINT:
         return new BackupNode(conf, startOpt.toNodeRole());