This is an automated email from the ASF dual-hosted git repository. msingh pushed a commit to branch revert-733-HDDS-3291 in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
commit cbf650f3faf5c517bdb06f03cabacb7258a8a850 Author: Mukul Kumar Singh <[email protected]> AuthorDate: Thu Apr 9 16:41:09 2020 +0530 Revert "HDDS-3291. Write operation when both OM followers are shutdown. (#733)" This reverts commit 5e23b25e21ab38148127b342dd5f8ada9b8c6e65. --- hadoop-hdds/common/src/main/resources/ozone-default.xml | 11 ----------- .../org/apache/hadoop/ozone/TestOzoneConfigurationFields.java | 1 - 2 files changed, 12 deletions(-) diff --git a/hadoop-hdds/common/src/main/resources/ozone-default.xml b/hadoop-hdds/common/src/main/resources/ozone-default.xml index 85156c3..9532086 100644 --- a/hadoop-hdds/common/src/main/resources/ozone-default.xml +++ b/hadoop-hdds/common/src/main/resources/ozone-default.xml @@ -1696,17 +1696,6 @@ </property> <property> - <name>ipc.client.rpc-timeout.ms</name> - <value>900000</value> - <description> - RpcClient timeout on waiting response from server. The default value is - set to 15 minutes. If ipc.client.ping is set to true and this rpc-timeout - is greater than the value of ipc.ping.interval, the effective value of - the rpc-timeout is rounded up to multiple of ipc.ping.interval. - </description> - </property> - - <property> <name>ozone.om.ratis.snapshot.dir</name> <value/> <tag>OZONE, OM, STORAGE, MANAGEMENT, RATIS</tag> diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java index d7a8d20..49f7f8d 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java @@ -44,7 +44,6 @@ public class TestOzoneConfigurationFields extends TestConfigurationFieldsBase { errorIfMissingXmlProps = true; xmlPropsToSkipCompare.add("hadoop.tags.custom"); xmlPropsToSkipCompare.add("ozone.om.nodes.EXAMPLEOMSERVICEID"); - xmlPrefixToSkipCompare.add("ipc.client.rpc-timeout.ms"); addPropertiesNotInXml(); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
