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/6ab2d19f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6ab2d19f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6ab2d19f Branch: refs/heads/HDFS-7285 Commit: 6ab2d19f5c010ab1d318214916ba95daa91a4dbf Parents: bdbe53c Author: Lei Xu <l...@cloudera.com> Authored: Sat Aug 29 09:57:27 2015 -0700 Committer: Lei Xu <l...@cloudera.com> Committed: Sat Aug 29 09:59:30 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/6ab2d19f/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 cef32d3..b813aa9 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 @@ -793,7 +793,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> @@ -805,7 +805,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/6ab2d19f/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/6ab2d19f/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>