HDDS-3291. Write operation when both OM followers are shutdown. (apac…

…he#733)
smengcl · Mar 30, 2020 · 5e23b25 · 5e23b25
1 parent 79ce00e
commit 5e23b25
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/hadoop-hdds/common/src/main/resources/ozone-default.xml b/hadoop-hdds/common/src/main/resources/ozone-default.xml
@@ -1685,6 +1685,17 @@
       .</description>
   </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/>

diff --git a/.../integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java b/.../integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java
@@ -44,6 +44,7 @@ public void initializeMemberVariables() {
     errorIfMissingXmlProps = true;
     xmlPropsToSkipCompare.add("hadoop.tags.custom");
     xmlPropsToSkipCompare.add("ozone.om.nodes.EXAMPLEOMSERVICEID");
+    xmlPrefixToSkipCompare.add("ipc.client.rpc-timeout.ms");
     addPropertiesNotInXml();
   }