Merge branch 'b2.1' of https://github.com/opensvc/opensvc into b2.1

opensvc · Jul 8, 2021 · 0ffbe2e · 0ffbe2e
2 parents 5d5ca20 + 51d9aa2
commit 0ffbe2e
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/opensvc/drivers/resource/app/__init__.py b/opensvc/drivers/resource/app/__init__.py
@@ -447,13 +447,20 @@ def start(self):
         ret = self.run("start", cmd)
         if ret != 0:
             raise ex.Error("exit code %d" % ret)
+
         def iu():
             try:
                 r = self.is_up()
+            except StatusNA:
+                r = core.status.NA
             except:
                 r = core.status.DOWN
+            if r == core.status.NA:
+                self.log.info("stop waiting for resource status up (currently n/a)")
             return r in (core.status.UP, core.status.NA)
+
         if self.start_timeout is not None:
+            self.log.info("wait for resource status up")
             self.wait_for_fn(iu, self.start_timeout, 1)
         self.can_rollback = True