Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "HDDS-1284. Adjust default values of pipline recovery for more resilient service restart. Contributed by Elek, Marton. (#608)" 

This reverts commit 44b8451821.
This commit is contained in:
Arpit Agarwal 2019-03-18 14:21:57 -07:00
parent 93db5da4d9
commit ae3a2c3851
No known key found for this signature in database
GPG Key ID: E4B09E903FDF9E98
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ScmConfigKeys.java
View File

@ -260,7 +260,7 @@ public final class ScmConfigKeys {
public static final String OZONE_SCM_STALENODE_INTERVAL = public static final String OZONE_SCM_STALENODE_INTERVAL =
"ozone.scm.stale.node.interval"; "ozone.scm.stale.node.interval";
public static final String OZONE_SCM_STALENODE_INTERVAL_DEFAULT = public static final String OZONE_SCM_STALENODE_INTERVAL_DEFAULT =
"5m"; "90s";
public static final String OZONE_SCM_HEARTBEAT_RPC_TIMEOUT = public static final String OZONE_SCM_HEARTBEAT_RPC_TIMEOUT =
"ozone.scm.heartbeat.rpc-timeout"; "ozone.scm.heartbeat.rpc-timeout";
@ -331,7 +331,7 @@ public final class ScmConfigKeys {
"ozone.scm.pipeline.destroy.timeout"; "ozone.scm.pipeline.destroy.timeout";
public static final String OZONE_SCM_PIPELINE_DESTROY_TIMEOUT_DEFAULT = public static final String OZONE_SCM_PIPELINE_DESTROY_TIMEOUT_DEFAULT =
"66s"; "300s";
public static final String OZONE_SCM_PIPELINE_CREATION_INTERVAL = public static final String OZONE_SCM_PIPELINE_CREATION_INTERVAL =
"ozone.scm.pipeline.creation.interval"; "ozone.scm.pipeline.creation.interval";

4
hadoop-hdds/common/src/main/resources/ozone-default.xml
View File

@ -1035,7 +1035,7 @@
</property> </property>
<property> <property>
<name>ozone.scm.stale.node.interval</name> <name>ozone.scm.stale.node.interval</name>
<value>5m</value> <value>90s</value>
<tag>OZONE, MANAGEMENT</tag> <tag>OZONE, MANAGEMENT</tag>
<description> <description>
The interval for stale node flagging. Please The interval for stale node flagging. Please
@ -1274,7 +1274,7 @@
</property> </property>
<property> <property>
<name>ozone.scm.pipeline.destroy.timeout</name> <name>ozone.scm.pipeline.destroy.timeout</name>
<value>66s</value> <value>300s</value>
<tag>OZONE, SCM, PIPELINE</tag> <tag>OZONE, SCM, PIPELINE</tag>
<description> <description>
Once a pipeline is closed, SCM should wait for the above configured time Once a pipeline is closed, SCM should wait for the above configured time