Revert "Bad merge with 996a627b289947af3894bf83e7b63ec702a665cd" This reverts commit 996a627b289947af3894bf83e7b63ec702a665cd.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/49cd77df Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/49cd77df Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/49cd77df Branch: refs/heads/HDDS-4 Commit: 49cd77df9964a0b338480ec4dc24883e2c35e5c6 Parents: a6e7091 Author: Xiaoyu Yao <x...@apache.org> Authored: Tue May 15 16:56:24 2018 -0700 Committer: Xiaoyu Yao <x...@apache.org> Committed: Thu May 31 08:49:34 2018 -0700 ---------------------------------------------------------------------- hadoop-hdds/common/src/main/resources/ozone-default.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/49cd77df/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 1857fc4..9f7fc84 100644 --- a/hadoop-hdds/common/src/main/resources/ozone-default.xml +++ b/hadoop-hdds/common/src/main/resources/ozone-default.xml @@ -129,6 +129,18 @@ </description> </property> <property> + <name>dfs.ratis.client.request.timeout.duration</name> + <value>3s</value> + <tag>OZONE, RATIS, MANAGEMENT</tag> + <description>The timeout duration for ratis client request.</description> + </property> + <property> + <name>dfs.ratis.server.request.timeout.duration</name> + <value>3s</value> + <tag>OZONE, RATIS, MANAGEMENT</tag> + <description>The timeout duration for ratis server request.</description> + </property> + <property> <name>ozone.container.report.interval</name> <value>60000ms</value> <tag>OZONE, CONTAINER, MANAGEMENT</tag> --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
