big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDFS-15694. Avoid calling UpdateHeartBeatState inside DataNodeDescriptor. (#2487) Contributed by Kuhu Shukla and Ahmed Hussein

Browse Source 
(cherry picked from commit 918ba9e82f)
This commit is contained in:
Ahmed Hussein 2020-12-01 15:02:53 -06:00 committed by Jim Brennan
parent 7d9c6edadf
commit a660714387
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeDescriptor.java
View File

@ -237,7 +237,8 @@ public Type getType() {
*/
public DatanodeDescriptor(DatanodeID nodeID) {
super(nodeID);
updateHeartbeatState(StorageReport.EMPTY_ARRAY, 0L, 0L, 0, 0, null);
setLastUpdate(Time.now());
setLastUpdateMonotonic(Time.monotonicNow());
}
/**
@ -248,7 +249,8 @@ public DatanodeDescriptor(DatanodeID nodeID) {
public DatanodeDescriptor(DatanodeID nodeID,
String networkLocation) {
super(nodeID, networkLocation);
updateHeartbeatState(StorageReport.EMPTY_ARRAY, 0L, 0L, 0, 0, null);
setLastUpdate(Time.now());
setLastUpdateMonotonic(Time.monotonicNow());
}
public CachedBlocksList getPendingCached() {

7
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestDatanodeDescriptor.java
View File

@ -19,6 +19,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue;
import java.util.ArrayList;
@ -63,16 +64,16 @@ public void testBlocksCounter() throws Exception {
DatanodeStorageInfo[] storages = dd.getStorageInfos();
assertTrue(storages.length > 0);
// add first block
assertTrue(storages[0].addBlock(blk) == AddBlockResult.ADDED);
assertEquals(AddBlockResult.ADDED, storages[0].addBlock(blk));
assertEquals(1, dd.numBlocks());
// remove a non-existent block
assertFalse(BlocksMap.removeBlock(dd, blk1));
assertEquals(1, dd.numBlocks());
// add an existent block
assertFalse(storages[0].addBlock(blk) == AddBlockResult.ADDED);
assertNotEquals(AddBlockResult.ADDED, storages[0].addBlock(blk));
assertEquals(1, dd.numBlocks());
// add second block
assertTrue(storages[0].addBlock(blk1) == AddBlockResult.ADDED);
assertEquals(AddBlockResult.ADDED, storages[0].addBlock(blk1));
assertEquals(2, dd.numBlocks());
// remove first block
assertTrue(BlocksMap.removeBlock(dd, blk));