Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

(cherry picked from commit a2c76e5f26)
This commit is contained in:
Vinayakumar B 2015-09-23 15:45:21 +05:30
parent 090b1f6398
commit 017dff9877
6 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-common-project/hadoop-common/src/site/markdown/Metrics.md
View File

@ -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

5
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -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

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

@ -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();
}

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

@ -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();
/**

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

@ -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);
}
/**

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

@ -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);