HDFS-9013. Deprecate NameNodeMXBean#getNNStarted in branch2 and remove from trunk (Contributed by Surendra Singh Lilhore)

(cherry picked from commit a2c76e5f26301d4b01e56b347442f3dec171591d)

hadoop-common-project/hadoop-common/src/site/markdown/Metrics.md

@@ -191,7 +191,7 @@ Each metrics record contains tags such as ProcessName, SessionId, and Hostname a
 | `GetImageAvgTime` | Average fsimage download time in milliseconds |
 | `PutImageNumOps` | Total number of fsimage uploads to SecondaryNameNode |
 | `PutImageAvgTime` | Average fsimage upload time in milliseconds |
-| `NNStarted`| NameNode start time |
+| `NNStarted`| Deprecated: Use NNStartedTimeInMillis instead  |
 | `NNStartedTimeInMillis`| NameNode start time in milliseconds |
 
 FSNamesystem

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

@@ -1038,7 +1038,10 @@ Release 2.8.0 - UNRELEASED
     HDFS-9063. Correctly handle snapshot path for getContentSummary. (jing9)
 
     HDFS-8780. Fetching live/dead datanode list with arg true for remove-
-    DecommissionNode,returns list with decom node. (J.Andreina via vinayakumab)
+    DecommissionNode,returns list with decom node. (J.Andreina via vinayakumarb)
+
+    HDFS-9013. Deprecate NameNodeMXBean#getNNStarted in branch2 and remove from
+    trunk (Surendra Singh Lilhore via vinayakumarb)
 
 Release 2.7.2 - UNRELEASED
 

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

@@ -6105,7 +6105,9 @@ public class FSNamesystem implements Namesystem, FSNamesystemMBean,
     return JSON.toString(txnIdMap);
   }
   
+  /** @deprecated Use {@link #getNNStartedTimeInMillis()} instead. */
   @Override  // NameNodeMXBean
+  @Deprecated
   public String getNNStarted() {
     return getStartTime().toString();
   }

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

@@ -233,9 +233,11 @@ public interface NameNodeMXBean {
 
   /**
    * Gets the NN start time
-   *
+   * @deprecated Use
+   * {@link #getNNStartedTimeInMillis()} instead.
    * @return the NN start time
    */
+  @Deprecated
   public String getNNStarted();
 
   /**

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestPendingInvalidateBlock.java

@@ -90,15 +90,12 @@ public class TestPendingInvalidateBlock {
     Thread.sleep(6000);
     Assert.assertEquals(0, cluster.getNamesystem().getBlocksTotal());
     Assert.assertEquals(0, cluster.getNamesystem().getPendingDeletionBlocks());
-    String nnStartedStr = cluster.getNamesystem().getNNStarted();
-    long nnStarted = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy")
-        .parse(nnStartedStr).getTime();
+    long nnStarted = cluster.getNamesystem().getNNStartedTimeInMillis();
     long blockDeletionStartTime = cluster.getNamesystem()
         .getBlockDeletionStartTime();
     Assert.assertTrue(String.format(
-        "Expect blockDeletionStartTime = %d > nnStarted = %d/nnStartedStr = %s.",
-        blockDeletionStartTime, nnStarted, nnStartedStr),
-        blockDeletionStartTime > nnStarted);
+        "Expect blockDeletionStartTime = %d > nnStarted = %d.",
+        blockDeletionStartTime, nnStarted), blockDeletionStartTime > nnStarted);
   }
 
   /**

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java

@@ -164,9 +164,6 @@ public class TestNameNodeMXBean {
           "JournalTransactionInfo");
       assertEquals("Bad value for NameTxnIds", fsn.getJournalTransactionInfo(),
           journalTxnInfo);
-      // get attribute "NNStarted"
-      String nnStarted = (String) mbs.getAttribute(mxbeanName, "NNStarted");
-      assertEquals("Bad value for NNStarted", fsn.getNNStarted(), nnStarted);
       // get attribute "CompileInfo"
       String compileInfo = (String) mbs.getAttribute(mxbeanName, "CompileInfo");
       assertEquals("Bad value for CompileInfo", fsn.getCompileInfo(), compileInfo);