You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ta...@apache.org on 2021/04/09 02:19:22 UTC
[hadoop] branch branch-3.3 updated: HDFS-15940. Fix
TestBlockRecovery2#testRaceBetweenReplicaRecoveryAndFinalizeBlock
(ADDENDUM) (#2874)
This is an automated email from the ASF dual-hosted git repository.
tasanuma pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.3 by this push:
new 4994b73 HDFS-15940. Fix TestBlockRecovery2#testRaceBetweenReplicaRecoveryAndFinalizeBlock (ADDENDUM) (#2874)
4994b73 is described below
commit 4994b73eebafc7b718f59ed293fcbadc677f95b8
Author: Viraj Jasani <vj...@apache.org>
AuthorDate: Fri Apr 9 07:40:18 2021 +0530
HDFS-15940. Fix TestBlockRecovery2#testRaceBetweenReplicaRecoveryAndFinalizeBlock (ADDENDUM) (#2874)
(cherry picked from commit 56bd968fb434c7d2ae7ac9e7659d0ca682340b2a)
---
.../org/apache/hadoop/hdfs/server/datanode/TestBlockRecovery2.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockRecovery2.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockRecovery2.java
index 03d5851..8d2df18 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockRecovery2.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockRecovery2.java
@@ -229,8 +229,8 @@ public class TestBlockRecovery2 {
tearDown();
Configuration configuration = new HdfsConfiguration();
- configuration.set(
- DFSConfigKeys.DFS_DATANODE_XCEIVER_STOP_TIMEOUT_MILLIS_KEY, "1000");
+ configuration.setLong(
+ DFSConfigKeys.DFS_DATANODE_XCEIVER_STOP_TIMEOUT_MILLIS_KEY, 5000L);
MiniDFSCluster cluster = new MiniDFSCluster.Builder(configuration)
.numDataNodes(1).build();
try {
@@ -257,6 +257,7 @@ public class TestBlockRecovery2 {
dataNode.initReplicaRecovery(recoveringBlock);
}
} catch (Exception e) {
+ LOG.error("Something went wrong.", e);
recoveryInitResult.set(false);
}
});
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org