This is an automated email from the ASF dual-hosted git repository.
jbrennan pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new 2331f86 HDFS-15694. Avoid calling UpdateHeartBeatState inside
DataNodeDescriptor. (#2487) Contributed by Kuhu Shukla and Ahmed Hussein
2331f86 is described below
commit 2331f86dfba3e51d9823e255d70282b5ab953a02
Author: Ahmed Hussein <50450311+amahuss...@users.noreply.github.com>
AuthorDate: Tue Dec 1 15:02:53 2020 -0600
HDFS-15694. Avoid calling UpdateHeartBeatState inside DataNodeDescriptor.
(#2487) Contributed by Kuhu Shukla and Ahmed Hussein
(cherry picked from commit 918ba9e82fb0bc6f96301c7ca74a32018b60c49e)
---
.../hadoop/hdfs/server/blockmanagement/DatanodeDescriptor.java | 6 ++++--
.../hadoop/hdfs/server/blockmanagement/TestDatanodeDescriptor.java | 7 ++++---
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeDescriptor.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeDescriptor.java
index 4edf76b..bd850c4 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeDescriptor.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeDescriptor.java
@@ -237,7 +237,8 @@ public class DatanodeDescriptor extends DatanodeInfo {
*/
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 class DatanodeDescriptor extends DatanodeInfo {
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() {
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestDatanodeDescriptor.java
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestDatanodeDescriptor.java
index 9580bae..eefc1d5 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestDatanodeDescriptor.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestDatanodeDescriptor.java
@@ -19,6 +19,7 @@ package org.apache.hadoop.hdfs.server.blockmanagement;
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 class TestDatanodeDescriptor {
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));
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
