Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-15654. TestBPOfferService#testMissBlocksWhenReregister fails intermittently (#2419)

This commit is contained in:
Ahmed Hussein 2020-10-28 18:24:34 -05:00 committed by GitHub
parent bab5bf9743
commit 324879127a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBPOfferService.java
View File

@ -34,6 +34,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.io.File;
import java.io.IOException;
@ -47,6 +48,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.hadoop.metrics2.MetricsRecordBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.hadoop.conf.Configuration;
@ -285,21 +287,18 @@ public class TestBPOfferService {
int totalTestBlocks = 4000;
Thread addNewBlockThread = null;
final AtomicInteger count = new AtomicInteger(0);
DataNodeFaultInjector prevDNFaultInjector = null;
try {
waitForBothActors(bpos);
waitForInitialization(bpos);
prevDNFaultInjector = DataNodeFaultInjector.get();
DataNodeFaultInjector.set(new DataNodeFaultInjector() {
public void blockUtilSendFullBlockReport() {
try {
GenericTestUtils.waitFor(() -> {
if(count.get() > 2000) {
return true;
}
return false;
}, 100, 1000);
GenericTestUtils.waitFor(() -> count.get() > 2000,
100, 1000);
} catch (Exception e) {
e.printStackTrace();
LOG.error("error DataNodeFaultInjector", e);
}
}
});
@ -318,45 +317,41 @@ public class TestBPOfferService {
count.addAndGet(1);
Thread.sleep(1);
} catch (Exception e) {
e.printStackTrace();
LOG.error("error addNewBlockThread", e);
}
}
});
addNewBlockThread.start();
// Make sure that generate blocks for DataNode and IBR not empty now.
GenericTestUtils.waitFor(() -> {
if(count.get() > 0) {
return true;
}
return false;
}, 100, 1000);
GenericTestUtils.waitFor(() -> count.get() > 0, 100, 1000);
// Trigger re-register using DataNode Command.
datanodeCommands[0] = new DatanodeCommand[]{RegisterCommand.REGISTER};
bpos.triggerHeartbeatForTests();
try {
GenericTestUtils.waitFor(() -> {
if(fullBlockReportCount == totalTestBlocks ||
incrBlockReportCount == totalTestBlocks) {
return true;
}
return false;
}, 1000, 15000);
} catch (Exception e) {}
// Verify FBR/IBR count is equal to generate number.
assertTrue(fullBlockReportCount == totalTestBlocks ||
incrBlockReportCount == totalTestBlocks);
} finally {
addNewBlockThread.join();
addNewBlockThread = null;
// Verify FBR/IBR count is equal to generate number.
try {
GenericTestUtils.waitFor(() ->
(fullBlockReportCount == totalTestBlocks ||
incrBlockReportCount == totalTestBlocks), 1000, 15000);
} catch (Exception e) {
fail(String.format("Timed out wait for IBR counts FBRCount = %d,"
+ " IBRCount = %d; expected = %d. Exception: %s",
fullBlockReportCount, incrBlockReportCount, totalTestBlocks,
e.getMessage()));
}
} finally {
if (addNewBlockThread != null) {
addNewBlockThread.interrupt();
}
bpos.stop();
bpos.join();
DataNodeFaultInjector.set(new DataNodeFaultInjector() {
public void blockUtilSendFullBlockReport() {}
});
DataNodeFaultInjector.set(prevDNFaultInjector);
}
}
@ -1216,4 +1211,4 @@ public class TestBPOfferService {
}
}
}
}
}