[hadoop] branch trunk updated: HDFS-15940. Fix TestBlockRecovery2#testRaceBetweenReplicaRecoveryAndFinalizeBlock (ADDENDUM) (#2874)

[tasanuma]

This is an automated email from the ASF dual-hosted git repository.

tasanuma pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 56bd968  HDFS-15940. Fix 
TestBlockRecovery2#testRaceBetweenReplicaRecoveryAndFinalizeBlock (ADDENDUM) 
(#2874)
56bd968 is described below

commit 56bd968fb434c7d2ae7ac9e7659d0ca682340b2a
Author: Viraj Jasani <vjas...@apache.org>
AuthorDate: Fri Apr 9 07:40:18 2021 +0530

    HDFS-15940. Fix 
TestBlockRecovery2#testRaceBetweenReplicaRecoveryAndFinalizeBlock (ADDENDUM) 
(#2874)
---
 .../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-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org