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

HDFS-9466. TestShortCircuitCache#testDataXceiverCleansUpSlotsOnFailure is flaky (Wei-Chiu Chuang via cmccabe)

This commit is contained in:
Colin Patrick Mccabe 2016-05-31 17:37:52 -07:00
parent 29d6cadc52
commit c7921c9bdd
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/ShortCircuitRegistry.java
View File

@ -394,12 +394,12 @@ public class ShortCircuitRegistry {
} }
public static interface Visitor { public static interface Visitor {
void accept(HashMap<ShmId, RegisteredShm> segments, boolean accept(HashMap<ShmId, RegisteredShm> segments,
HashMultimap<ExtendedBlockId, Slot> slots); HashMultimap<ExtendedBlockId, Slot> slots);
} }
@VisibleForTesting @VisibleForTesting
public synchronized void visit(Visitor visitor) { public synchronized boolean visit(Visitor visitor) {
visitor.accept(segments, slots); return visitor.accept(segments, slots);
} }
} }

34
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/shortcircuit/TestShortCircuitCache.java
View File

@ -32,6 +32,7 @@ import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.Map; import java.util.Map;
import java.util.concurrent.TimeoutException;
import org.apache.commons.lang.mutable.MutableBoolean; import org.apache.commons.lang.mutable.MutableBoolean;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
@ -624,15 +625,22 @@ public class TestShortCircuitCache {
} }
static private void checkNumberOfSegmentsAndSlots(final int expectedSegments, static private void checkNumberOfSegmentsAndSlots(final int expectedSegments,
final int expectedSlots, ShortCircuitRegistry registry) { final int expectedSlots, final ShortCircuitRegistry registry)
registry.visit(new ShortCircuitRegistry.Visitor() { throws InterruptedException, TimeoutException {
GenericTestUtils.waitFor(new Supplier<Boolean>() {
@Override @Override
public void accept(HashMap<ShmId, RegisteredShm> segments, public Boolean get() {
HashMultimap<ExtendedBlockId, Slot> slots) { return registry.visit(new ShortCircuitRegistry.Visitor() {
Assert.assertEquals(expectedSegments, segments.size()); @Override
Assert.assertEquals(expectedSlots, slots.size()); public boolean accept(HashMap<ShmId, RegisteredShm> segments,
HashMultimap<ExtendedBlockId, Slot> slots) {
return (expectedSegments == segments.size()) &&
(expectedSlots == slots.size());
}
});
} }
}); }, 100, 10000);
} }
public static class TestCleanupFailureInjector public static class TestCleanupFailureInjector
@ -774,16 +782,8 @@ public class TestShortCircuitCache {
DFSTestUtil.createFile(fs, TEST_PATH2, 4096, (short)1, 0xFADE2); DFSTestUtil.createFile(fs, TEST_PATH2, 4096, (short)1, 0xFADE2);
DFSTestUtil.readFileBuffer(fs, TEST_PATH1); DFSTestUtil.readFileBuffer(fs, TEST_PATH1);
DFSTestUtil.readFileBuffer(fs, TEST_PATH2); DFSTestUtil.readFileBuffer(fs, TEST_PATH2);
ShortCircuitRegistry registry = checkNumberOfSegmentsAndSlots(1, 2,
cluster.getDataNodes().get(0).getShortCircuitRegistry(); cluster.getDataNodes().get(0).getShortCircuitRegistry());
registry.visit(new ShortCircuitRegistry.Visitor() {
@Override
public void accept(HashMap<ShmId, RegisteredShm> segments,
HashMultimap<ExtendedBlockId, Slot> slots) {
Assert.assertEquals(1, segments.size());
Assert.assertEquals(2, slots.size());
}
});
cluster.shutdown(); cluster.shutdown();
sockDir.close(); sockDir.close();
} }