HDDS-828. Fix deprecation log generated by getting value of the setting ozone.scm.heartbeat.rpc-timeout. Contributed by Yiqun Lin.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2718f753 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2718f753 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2718f753 Branch: refs/heads/HDFS-12943 Commit: 2718f7534dc64a27cd1b6c706e3d81816e780e22 Parents: fb1e8bb Author: Márton Elek <e...@apache.org> Authored: Thu Nov 15 14:04:55 2018 +0100 Committer: Márton Elek <e...@apache.org> Committed: Thu Nov 15 14:04:55 2018 +0100 ---------------------------------------------------------------------- .../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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/2718f753/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ScmConfigKeys.java ---------------------------------------------------------------------- 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 b748d69..595135d 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 @@ -226,8 +226,8 @@ public final class ScmConfigKeys { public static final String OZONE_SCM_HEARTBEAT_RPC_TIMEOUT = "ozone.scm.heartbeat.rpc-timeout"; - public static final long OZONE_SCM_HEARTBEAT_RPC_TIMEOUT_DEFAULT = - 1000; + public static final String OZONE_SCM_HEARTBEAT_RPC_TIMEOUT_DEFAULT = + "1s"; /** * Defines how frequently we will log the missing of heartbeat to a specific http://git-wip-us.apache.org/repos/asf/hadoop/blob/2718f753/hadoop-hdds/common/src/main/resources/ozone-default.xml ---------------------------------------------------------------------- diff --git a/hadoop-hdds/common/src/main/resources/ozone-default.xml b/hadoop-hdds/common/src/main/resources/ozone-default.xml index e94e7e1..b31e490 100644 --- a/hadoop-hdds/common/src/main/resources/ozone-default.xml +++ b/hadoop-hdds/common/src/main/resources/ozone-default.xml @@ -837,10 +837,10 @@ </property> <property> <name>ozone.scm.heartbeat.rpc-timeout</name> - <value>1000</value> + <value>1s</value> <tag>OZONE, MANAGEMENT</tag> <description> - Timeout value for the RPC from Datanode to SCM in milliseconds. + Timeout value for the RPC from Datanode to SCM. </description> </property> <property> --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
