[HOPS-1522] fix DBRMStateStore.checkAvailableResources

hopshadoop · Oct 21, 2019 · df38751 · df38751
1 parent 0c2f39d
commit df38751
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
@@ -2978,7 +2978,7 @@
     <description>The interval (in ms) at which the database resource monitor
     should checkt the database status</description>
     <name>yarn.resourcemanager.resource.check.interval</name>
-    <value>3</value>
+    <value>5000</value>
   </property>
 
   <property>

diff --git a/.../src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/DBRMStateStore.java b/.../src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/DBRMStateStore.java
@@ -885,6 +885,7 @@ void checkAvailableResources() {
           if (!RMStorageFactory.hasResources(databaseResourcesThreshold)) {
             throw new IOException("not enough resources in the database");
           }
+          return;
         } catch (StorageException e) {
           LOG.warn("StorageException in checkAvailableResources (" + tries + "/" + maxDBTries + ").", e);
           if (e instanceof TransientStorageException) {