This is an automated email from the ASF dual-hosted git repository. arp pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push: new ae3a2c3 Revert "HDDS-1284. Adjust default values of pipline recovery for more resilient service restart. Contributed by Elek, Marton. (#608)" ae3a2c3 is described below commit ae3a2c3851cbf7f010f7ae5734ed9e2dbac5d50c Author: Arpit Agarwal <a...@apache.org> AuthorDate: Mon Mar 18 14:21:57 2019 -0700 Revert "HDDS-1284. Adjust default values of pipline recovery for more resilient service restart. Contributed by Elek, Marton. (#608)" This reverts commit 44b8451821c392dd59ee84153c98547ae9ce7042. --- .../src/main/java/org/apache/hadoop/hdds/scm/ScmConfigKeys.java | 4 ++-- hadoop-hdds/common/src/main/resources/ozone-default.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ScmConfigKeys.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ScmConfigKeys.java index 7a3baff..4e197d3 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ScmConfigKeys.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ScmConfigKeys.java @@ -260,7 +260,7 @@ public final class ScmConfigKeys { public static final String OZONE_SCM_STALENODE_INTERVAL = "ozone.scm.stale.node.interval"; public static final String OZONE_SCM_STALENODE_INTERVAL_DEFAULT = - "5m"; + "90s"; public static final String OZONE_SCM_HEARTBEAT_RPC_TIMEOUT = "ozone.scm.heartbeat.rpc-timeout"; @@ -331,7 +331,7 @@ public final class ScmConfigKeys { "ozone.scm.pipeline.destroy.timeout"; public static final String OZONE_SCM_PIPELINE_DESTROY_TIMEOUT_DEFAULT = - "66s"; + "300s"; public static final String OZONE_SCM_PIPELINE_CREATION_INTERVAL = "ozone.scm.pipeline.creation.interval"; diff --git a/hadoop-hdds/common/src/main/resources/ozone-default.xml b/hadoop-hdds/common/src/main/resources/ozone-default.xml index dd43c62..99977f8 100644 --- a/hadoop-hdds/common/src/main/resources/ozone-default.xml +++ b/hadoop-hdds/common/src/main/resources/ozone-default.xml @@ -1035,7 +1035,7 @@ </property> <property> <name>ozone.scm.stale.node.interval</name> - <value>5m</value> + <value>90s</value> <tag>OZONE, MANAGEMENT</tag> <description> The interval for stale node flagging. Please @@ -1274,7 +1274,7 @@ </property> <property> <name>ozone.scm.pipeline.destroy.timeout</name> - <value>66s</value> + <value>300s</value> <tag>OZONE, SCM, PIPELINE</tag> <description> Once a pipeline is closed, SCM should wait for the above configured time --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org