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

HDFS-15471. TestHDFSContractMultipartUploader failing (#2252)

Browse Source 
Contributed by Steve Loughran
(Was: broken by Steve Loughran)

Change-Id: If6a82706f3ea6d802bc6da03c2a2ca734e30388f
This commit is contained in:
Steve Loughran 2020-08-28 15:39:09 +01:00
parent f6e1ed4f6b
commit 1b9109d237
No known key found for this signature in database
GPG Key ID: D22CF846DBB162A0
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/AbstractContractMultipartUploaderTest.java
View File

@ -807,12 +807,17 @@ public void testConcurrentUploads() throws Throwable {
// now upload part 2. // now upload part 2.
complete(file, upload2, partHandles2); complete(file, upload2, partHandles2);
// and await the visible length to match
eventually(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), () -> verifyFileLength(file, size2),
new LambdaTestUtils.ProportionalRetryInterval( new LambdaTestUtils.ProportionalRetryInterval(
CONSISTENCY_INTERVAL, CONSISTENCY_INTERVAL,
timeToBecomeConsistentMillis())); consistencyDelay));
}
verifyContents(file, digest2, size2); verifyContents(file, digest2, size2);
} }

2
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/contract/hdfs/TestHDFSContractMultipartUploader.java
View File

@ -35,7 +35,7 @@ public class TestHDFSContractMultipartUploader extends
AbstractContractMultipartUploaderTest { AbstractContractMultipartUploaderTest {
protected static final Logger LOG = protected static final Logger LOG =
LoggerFactory.getLogger(AbstractContractMultipartUploaderTest.class); LoggerFactory.getLogger(TestHDFSContractMultipartUploader.class);
@BeforeClass @BeforeClass
public static void createCluster() throws IOException { public static void createCluster() throws IOException {