From df387512a80b8475e856d2d51fe03d9f996df788 Mon Sep 17 00:00:00 2001
From: gautier <gautier.berthou@gmail.com>
Date: Fri, 18 Oct 2019 14:24:05 +0200
Subject: [PATCH] [HOPS-1522] fix DBRMStateStore.checkAvailableResources

---
 .../hadoop-yarn-common/src/main/resources/yarn-default.xml      | 2 +-
 .../yarn/server/resourcemanager/recovery/DBRMStateStore.java    | 1 +
 2 files changed, 2 insertions(+), 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
index c17b1e8aee..ad0e30e039 100644
--- 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/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/DBRMStateStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/DBRMStateStore.java
index f7e256b434..584e8e34e2 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/DBRMStateStore.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/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) {