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 wa...@apache.org on 2016/04/08 20:31:16 UTC
[05/20] hadoop git commit: HADOOP-12753 S3A JUnit tests failing if
using HTTP proxy. (Zoran Rajic via stevel)
HADOOP-12753 S3A JUnit tests failing if using HTTP proxy. (Zoran Rajic via stevel)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ce5b4812
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ce5b4812
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ce5b4812
Branch: refs/heads/YARN-3368
Commit: ce5b4812f0f43ba9271343f405749d18794d672c
Parents: 6791221
Author: Steve Loughran <st...@apache.org>
Authored: Fri Apr 8 17:09:47 2016 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Fri Apr 8 17:10:00 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/hadoop/fs/s3a/TestS3AConfiguration.java | 2 ++
.../apache/hadoop/fs/s3a/scale/TestS3ADeleteManyFiles.java | 9 +++++++++
2 files changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ce5b4812/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestS3AConfiguration.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestS3AConfiguration.java b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestS3AConfiguration.java
index e74ebca..ae1539d 100644
--- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestS3AConfiguration.java
+++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestS3AConfiguration.java
@@ -123,6 +123,7 @@ public class TestS3AConfiguration {
@Test
public void testProxyPortWithoutHost() throws Exception {
conf = new Configuration();
+ conf.unset(Constants.PROXY_HOST);
conf.setInt(Constants.MAX_ERROR_RETRIES, 2);
conf.setInt(Constants.PROXY_PORT, 1);
try {
@@ -140,6 +141,7 @@ public class TestS3AConfiguration {
@Test
public void testAutomaticProxyPortSelection() throws Exception {
conf = new Configuration();
+ conf.unset(Constants.PROXY_PORT);
conf.setInt(Constants.MAX_ERROR_RETRIES, 2);
conf.set(Constants.PROXY_HOST, "127.0.0.1");
conf.set(Constants.SECURE_CONNECTIONS, "true");
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ce5b4812/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/scale/TestS3ADeleteManyFiles.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/scale/TestS3ADeleteManyFiles.java b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/scale/TestS3ADeleteManyFiles.java
index d521ba8..2930e96 100644
--- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/scale/TestS3ADeleteManyFiles.java
+++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/scale/TestS3ADeleteManyFiles.java
@@ -44,6 +44,15 @@ public class TestS3ADeleteManyFiles extends S3AScaleTestBase {
@Rule
public Timeout testTimeout = new Timeout(30 * 60 * 1000);
+ /**
+ * CAUTION: If this test starts failing, please make sure that the
+ * {@link org.apache.hadoop.fs.s3a.Constants#MAX_THREADS} configuration is not
+ * set too low. Alternatively, consider reducing the
+ * <code>scale.test.operation.count</code> parameter in
+ * <code>getOperationCount()</code>.
+ *
+ * @see #getOperationCount()
+ */
@Test
public void testBulkRenameAndDelete() throws Throwable {
final Path scaleTestDir = getTestPath();