This is an automated email from the ASF dual-hosted git repository.
arp pushed a commit to branch ozone-0.4
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/ozone-0.4 by this push:
new 7cd82b4 Revert "HDDS-1284. Adjust default values of pipline recovery
for more resilient service restart. Contributed by Elek, Marton. (#608)"
7cd82b4 is described below
commit 7cd82b4547ab776863a33cbff7e7978ee490be49
Author: Arpit Agarwal <[email protected]>
AuthorDate: Mon Mar 18 14:23:56 2019 -0700
Revert "HDDS-1284. Adjust default values of pipline recovery for more
resilient service restart. Contributed by Elek, Marton. (#608)"
This reverts commit 0d35cfc0065a021318c604dc01dd2794acb9105b.
---
.../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 a45a169..4c67eb3 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 9a5a35b..d09360a 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: [email protected]
For additional commands, e-mail: [email protected]
