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 5cacc876d0..4a423588f5 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 = - "90s"; + "5m"; public static final String OZONE_SCM_HEARTBEAT_RPC_TIMEOUT = "ozone.scm.heartbeat.rpc-timeout"; @@ -330,7 +330,7 @@ public final class ScmConfigKeys { "ozone.scm.pipeline.destroy.timeout"; public static final String OZONE_SCM_PIPELINE_DESTROY_TIMEOUT_DEFAULT = - "300s"; + "66s"; 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 c8a566a794..a46ddb16a8 100644 --- a/hadoop-hdds/common/src/main/resources/ozone-default.xml +++ b/hadoop-hdds/common/src/main/resources/ozone-default.xml @@ -1052,7 +1052,7 @@ ozone.scm.stale.node.interval - 90s + 5m OZONE, MANAGEMENT The interval for stale node flagging. Please @@ -1291,7 +1291,7 @@ ozone.scm.pipeline.destroy.timeout - 300s + 66s OZONE, SCM, PIPELINE Once a pipeline is closed, SCM should wait for the above configured time