[prev in list] [next in list] [prev in thread] [next in thread] 

List:       hadoop-commits
Subject:    [hadoop] branch branch-3.3 updated: HDFS-15471. TestHDFSContractMultipartUploader failing (#2252)
From:       stevel () apache ! org
Date:       2020-08-28 14:47:22
Message-ID: 159862604234.8190.7012897053612345591 () gitbox ! apache ! org
[Download RAW message or body]

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

stevel 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 1b9109d  HDFS-15471. TestHDFSContractMultipartUploader failing (#2252)
1b9109d is described below

commit 1b9109d237d25342703acf4f99a03100b0ba061a
Author: Steve Loughran <stevel@cloudera.com>
AuthorDate: Fri Aug 28 15:39:09 2020 +0100

    HDFS-15471. TestHDFSContractMultipartUploader failing (#2252)
    
    Contributed by Steve Loughran
    (Was: broken by Steve Loughran)
    
    Change-Id: If6a82706f3ea6d802bc6da03c2a2ca734e30388f
---
 .../contract/AbstractContractMultipartUploaderTest.java | 17 +++++++++++------
 .../hdfs/TestHDFSContractMultipartUploader.java         |  2 +-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/AbstractContractMultipartUploaderTest.java \
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/AbstractContractMultipartUploaderTest.java
 index 3192696..8a520fa 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/AbstractContractMultipartUploaderTest.java
                
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/AbstractContractMultipartUploaderTest.java
 @@ -807,12 +807,17 @@ public abstract class AbstractContractMultipartUploaderTest \
extends  
     // now upload part 2.
     complete(file, upload2, partHandles2);
-    // and await the visible length to match
-    eventually(timeToBecomeConsistentMillis(),
-        () -> verifyFileLength(file, size2),
-        new LambdaTestUtils.ProportionalRetryInterval(
-            CONSISTENCY_INTERVAL,
-            timeToBecomeConsistentMillis()));
+
+    // and await the visible length to match, if this FS is not
+    // consistent.
+    final int consistencyDelay = timeToBecomeConsistentMillis();
+    if (consistencyDelay > 0) {
+      eventually(consistencyDelay,
+          () -> verifyFileLength(file, size2),
+          new LambdaTestUtils.ProportionalRetryInterval(
+              CONSISTENCY_INTERVAL,
+              consistencyDelay));
+    }
 
     verifyContents(file, digest2, size2);
   }
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/contract/hdfs/TestHDFSContractMultipartUploader.java \
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/contract/hdfs/TestHDFSContractMultipartUploader.java
 index 54f4ed2..0efb33f 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/contract/hdfs/TestHDFSContractMultipartUploader.java
                
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/contract/hdfs/TestHDFSContractMultipartUploader.java
 @@ -35,7 +35,7 @@ public class TestHDFSContractMultipartUploader extends
     AbstractContractMultipartUploaderTest {
 
   protected static final Logger LOG =
-      LoggerFactory.getLogger(AbstractContractMultipartUploaderTest.class);
+      LoggerFactory.getLogger(TestHDFSContractMultipartUploader.class);
 
   @BeforeClass
   public static void createCluster() throws IOException {


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


[prev in list] [next in list] [prev in thread] [next in thread]