From common-commits-return-93766-archive-asf-public=cust-asf.ponee.io@hadoop.apache.org Mon Mar 18 21:24:31 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id C450B180651 for ; Mon, 18 Mar 2019 22:24:30 +0100 (CET) Received: (qmail 44577 invoked by uid 500); 18 Mar 2019 21:24:29 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 44568 invoked by uid 99); 18 Mar 2019 21:24:29 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Mar 2019 21:24:29 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 29C1B82F24; Mon, 18 Mar 2019 21:24:29 +0000 (UTC) Date: Mon, 18 Mar 2019 21:24:27 +0000 To: "common-commits@hadoop.apache.org" Subject: [hadoop] branch ozone-0.4 updated: Revert "HDDS-1284. Adjust default values of pipline recovery for more resilient service restart. Contributed by Elek, Marton. (#608)" MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <155294426578.15264.15853854414683496496@gitbox.apache.org> From: arp@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: hadoop X-Git-Refname: refs/heads/ozone-0.4 X-Git-Reftype: branch X-Git-Oldrev: 6fd95b8595963bf5b30ef0170a83c33571d9845a X-Git-Newrev: 7cd82b4547ab776863a33cbff7e7978ee490be49 X-Git-Rev: 7cd82b4547ab776863a33cbff7e7978ee490be49 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated 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 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 @@ ozone.scm.stale.node.interval - 5m + 90s OZONE, MANAGEMENT The interval for stale node flagging. Please @@ -1274,7 +1274,7 @@ ozone.scm.pipeline.destroy.timeout - 66s + 300s OZONE, SCM, PIPELINE Once a pipeline is closed, SCM should wait for the above configured time --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org