HDFS-14135. TestWebHdfsTimeouts Fails intermittently in trunk. Contributed by Ayush Saxena.

Signed-off-by: Masatake Iwasaki <iwasakims@apache.org>
This commit is contained in:
Masatake Iwasaki 2019-06-21 14:33:41 +09:00
parent b7fba78fb6
commit 6b8107ad97
1 changed files with 28 additions and 0 deletions

View File

@ -35,6 +35,7 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.concurrent.TimeoutException;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -47,6 +48,7 @@ import org.apache.hadoop.net.NetUtils;
import org.apache.hadoop.security.authentication.client.ConnectionConfigurator; import org.apache.hadoop.security.authentication.client.ConnectionConfigurator;
import org.apache.hadoop.test.GenericTestUtils; import org.apache.hadoop.test.GenericTestUtils;
import org.junit.After; import org.junit.After;
import org.junit.AssumptionViolatedException;
import org.junit.Before; import org.junit.Before;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
@ -85,6 +87,7 @@ public class TestWebHdfsTimeouts {
return conn; return conn;
} }
}); });
private volatile boolean failedToConsumeBacklog;
public enum TimeoutSource { ConnectionFactory, Configuration }; public enum TimeoutSource { ConnectionFactory, Configuration };
@ -123,6 +126,7 @@ public class TestWebHdfsTimeouts {
clients = new ArrayList<SocketChannel>(); clients = new ArrayList<SocketChannel>();
serverThread = null; serverThread = null;
failedToConsumeBacklog = false;
} }
@After @After
@ -213,6 +217,7 @@ public class TestWebHdfsTimeouts {
fs.getFileChecksum(new Path("/file")); fs.getFileChecksum(new Path("/file"));
fail("expected timeout"); fail("expected timeout");
} catch (SocketTimeoutException e) { } catch (SocketTimeoutException e) {
assumeBacklogConsumed();
GenericTestUtils.assertExceptionContains( GenericTestUtils.assertExceptionContains(
fs.getUri().getAuthority() + ": connect timed out", e); fs.getUri().getAuthority() + ": connect timed out", e);
} }
@ -246,6 +251,7 @@ public class TestWebHdfsTimeouts {
os = fs.create(new Path("/file")); os = fs.create(new Path("/file"));
fail("expected timeout"); fail("expected timeout");
} catch (SocketTimeoutException e) { } catch (SocketTimeoutException e) {
assumeBacklogConsumed();
GenericTestUtils.assertExceptionContains( GenericTestUtils.assertExceptionContains(
fs.getUri().getAuthority() + ": connect timed out", e); fs.getUri().getAuthority() + ": connect timed out", e);
} finally { } finally {
@ -359,6 +365,28 @@ public class TestWebHdfsTimeouts {
client.connect(nnHttpAddress); client.connect(nnHttpAddress);
clients.add(client); clients.add(client);
} }
try {
GenericTestUtils.waitFor(() -> {
try (SocketChannel c = SocketChannel.open()) {
c.socket().connect(nnHttpAddress, 100);
} catch (SocketTimeoutException e) {
return true;
} catch (IOException e) {
LOG.debug("unexpected exception: " + e);
}
return false;
}, 100, 10000);
} catch (TimeoutException | InterruptedException e) {
failedToConsumeBacklog = true;
assumeBacklogConsumed();
}
}
private void assumeBacklogConsumed() {
if (failedToConsumeBacklog) {
throw new AssumptionViolatedException(
"failed to fill up connection backlog.");
}
} }
/** /**