You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by xk...@apache.org on 2019/07/26 18:36:19 UTC
[hadoop] branch branch-3.2 updated: Revert "HDFS-14135.
TestWebHdfsTimeouts Fails intermittently in trunk. Contributed by Ayush
Saxena."
This is an automated email from the ASF dual-hosted git repository.
xkrogen pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.2 by this push:
new bd5033e Revert "HDFS-14135. TestWebHdfsTimeouts Fails intermittently in trunk. Contributed by Ayush Saxena."
bd5033e is described below
commit bd5033e6f964b5efa1227a3d965e8ba72f0eef34
Author: Erik Krogen <xk...@apache.org>
AuthorDate: Fri Jul 26 11:36:06 2019 -0700
Revert "HDFS-14135. TestWebHdfsTimeouts Fails intermittently in trunk. Contributed by Ayush Saxena."
This reverts commit 2478d333a6dc3123f4e84d4bbb6991f1cbda1ea6.
---
.../hadoop/hdfs/web/TestWebHdfsTimeouts.java | 28 ----------------------
1 file changed, 28 deletions(-)
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestWebHdfsTimeouts.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestWebHdfsTimeouts.java
index a693ac3..7b44515 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestWebHdfsTimeouts.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestWebHdfsTimeouts.java
@@ -35,7 +35,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
-import java.util.concurrent.TimeoutException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -48,7 +47,6 @@ import org.apache.hadoop.net.NetUtils;
import org.apache.hadoop.security.authentication.client.ConnectionConfigurator;
import org.apache.hadoop.test.GenericTestUtils;
import org.junit.After;
-import org.junit.AssumptionViolatedException;
import org.junit.Before;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -87,7 +85,6 @@ public class TestWebHdfsTimeouts {
return conn;
}
});
- private volatile boolean failedToConsumeBacklog;
public enum TimeoutSource { ConnectionFactory, Configuration };
@@ -126,7 +123,6 @@ public class TestWebHdfsTimeouts {
clients = new ArrayList<SocketChannel>();
serverThread = null;
- failedToConsumeBacklog = false;
}
@After
@@ -217,7 +213,6 @@ public class TestWebHdfsTimeouts {
fs.getFileChecksum(new Path("/file"));
fail("expected timeout");
} catch (SocketTimeoutException e) {
- assumeBacklogConsumed();
GenericTestUtils.assertExceptionContains(
fs.getUri().getAuthority() + ": connect timed out", e);
}
@@ -251,7 +246,6 @@ public class TestWebHdfsTimeouts {
os = fs.create(new Path("/file"));
fail("expected timeout");
} catch (SocketTimeoutException e) {
- assumeBacklogConsumed();
GenericTestUtils.assertExceptionContains(
fs.getUri().getAuthority() + ": connect timed out", e);
} finally {
@@ -365,28 +359,6 @@ public class TestWebHdfsTimeouts {
client.connect(nnHttpAddress);
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.");
- }
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org