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 le...@apache.org on 2015/08/29 18:59:00 UTC
hadoop git commit: HADOOP-12346. Increase some default timeouts /
retries for S3a connector. (Sean Mackrory via Lei (Eddy) Xu)
Repository: hadoop
Updated Branches:
refs/heads/branch-2 f1d5f1417 -> de42fce39
HADOOP-12346. Increase some default timeouts / retries for S3a connector. (Sean Mackrory via Lei (Eddy) Xu)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/de42fce3
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/de42fce3
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/de42fce3
Branch: refs/heads/branch-2
Commit: de42fce3900fcd6d8a06c73578020e5d7165d53d
Parents: f1d5f14
Author: Lei Xu <le...@cloudera.com>
Authored: Sat Aug 29 09:57:27 2015 -0700
Committer: Lei Xu <le...@cloudera.com>
Committed: Sat Aug 29 09:58:57 2015 -0700
----------------------------------------------------------------------
.../hadoop-common/src/main/resources/core-default.xml | 4 ++--
.../src/main/java/org/apache/hadoop/fs/s3a/Constants.java | 4 ++--
.../hadoop-aws/src/site/markdown/tools/hadoop-aws/index.md | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/de42fce3/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
index f161f7d..ca33cf5 100644
--- a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
+++ b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
@@ -794,7 +794,7 @@ for ldap providers in the same way as above does.
<property>
<name>fs.s3a.attempts.maximum</name>
- <value>10</value>
+ <value>20</value>
<description>How many times we should retry commands on transient errors.</description>
</property>
@@ -806,7 +806,7 @@ for ldap providers in the same way as above does.
<property>
<name>fs.s3a.connection.timeout</name>
- <value>50000</value>
+ <value>200000</value>
<description>Socket connection timeout in milliseconds.</description>
</property>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/de42fce3/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/Constants.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/Constants.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/Constants.java
index fe8dd77..fa81d93 100644
--- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/Constants.java
+++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/Constants.java
@@ -45,7 +45,7 @@ public class Constants {
// number of times we should retry errors
public static final String MAX_ERROR_RETRIES = "fs.s3a.attempts.maximum";
- public static final int DEFAULT_MAX_ERROR_RETRIES = 10;
+ public static final int DEFAULT_MAX_ERROR_RETRIES = 20;
// seconds until we give up trying to establish a connection to s3
public static final String ESTABLISH_TIMEOUT = "fs.s3a.connection.establish.timeout";
@@ -53,7 +53,7 @@ public class Constants {
// seconds until we give up on a connection to s3
public static final String SOCKET_TIMEOUT = "fs.s3a.connection.timeout";
- public static final int DEFAULT_SOCKET_TIMEOUT = 50000;
+ public static final int DEFAULT_SOCKET_TIMEOUT = 200000;
// number of records to get while paging through a directory listing
public static final String MAX_PAGING_KEYS = "fs.s3a.paging.maximum";
http://git-wip-us.apache.org/repos/asf/hadoop/blob/de42fce3/hadoop-tools/hadoop-aws/src/site/markdown/tools/hadoop-aws/index.md
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-aws/src/site/markdown/tools/hadoop-aws/index.md b/hadoop-tools/hadoop-aws/src/site/markdown/tools/hadoop-aws/index.md
index 5d45e0a..6df15e6 100644
--- a/hadoop-tools/hadoop-aws/src/site/markdown/tools/hadoop-aws/index.md
+++ b/hadoop-tools/hadoop-aws/src/site/markdown/tools/hadoop-aws/index.md
@@ -206,7 +206,7 @@ If you do any of these: change your credentials immediately!
<property>
<name>fs.s3a.attempts.maximum</name>
- <value>10</value>
+ <value>20</value>
<description>How many times we should retry commands on transient errors.</description>
</property>
@@ -218,7 +218,7 @@ If you do any of these: change your credentials immediately!
<property>
<name>fs.s3a.connection.timeout</name>
- <value>50000</value>
+ <value>200000</value>
<description>Socket connection timeout in milliseconds.</description>
</property>