Ansible-runner: Fix getting status of playbook

Ansible-runner command does nolonger create status file when running but only after it finished. This patch changes the logic to return status running acording to daemon.log which is created right after the playbook is started.
oVirt · Jun 23, 2022 · 27db8ef · 27db8ef
1 parent 843c091
commit 27db8ef
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AnsibleCallback.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AnsibleCallback.java
@@ -61,12 +61,10 @@ public void doPolling(Guid cmdId, List<Guid> childCmdIds) {
 
         AnsibleReturnValue ret = new AnsibleReturnValue(AnsibleReturnCode.ERROR);
         ret.setLogFile(runnerClient.getLogger().getLogFile());
-        String msg = "";
         int totalEvents;
         // Get the current status of the playbook:
         AnsibleRunnerClient.PlaybookStatus playbookStatus = runnerClient.getPlaybookStatus(playUuid);
-        String status = playbookStatus.getStatus();
-        msg = playbookStatus.getMsg();
+        String msg = playbookStatus.getMsg();
         // Process the events if the playbook is running:
         totalEvents = runnerClient.getTotalEvents(playUuid);
 
@@ -82,9 +80,6 @@ public void doPolling(Guid cmdId, List<Guid> childCmdIds) {
             ret.setAnsibleReturnCode(AnsibleReturnCode.OK);
             command.setSucceeded(true);
             command.setCommandStatus(CommandStatus.SUCCEEDED);
-        } else if (status.equalsIgnoreCase("unknown")) {
-            // ignore and continue:
-            return;
         } else {
             // Playbook failed:
             command.setSucceeded(false);

diff --git a/...les/bll/src/main/java/org/ovirt/engine/core/common/utils/ansible/AnsibleRunnerClient.java b/...les/bll/src/main/java/org/ovirt/engine/core/common/utils/ansible/AnsibleRunnerClient.java
@@ -265,14 +265,19 @@ protected String formatCommandVariables(Map<String, Object> variables, String pl
     public PlaybookStatus getPlaybookStatus(String playUuid) {
         String status = "";
         String rc = "";
+        String privateRunDir = String.format("%1$s/%2$s/", AnsibleConstants.ANSIBLE_RUNNER_PATH, playUuid);
         String playData = String.format("%1$s/%2$s/artifacts/%2$s/", AnsibleConstants.ANSIBLE_RUNNER_PATH, playUuid);
         try {
-            if (!Files.exists(Paths.get(String.format("%1$s/status", playData)))) {
+            if (Files.exists(Paths.get(String.format("%1$s/status", playData)))) {
+                status = Files.readString(Paths.get(String.format("%1$s/status", playData)));
+                rc = Files.readString(Paths.get(String.format("%1$s/rc", playData)));
+            } else if (Files.exists(Paths.get(String.format("%1$s/daemon.log", privateRunDir)))) {
                 // artifacts are not yet present, try to fetch them in the next polling round
-                return new PlaybookStatus("unknown", "");
+                return new PlaybookStatus("", "running");
+            } else {
+                log.warn(String.format("The playbook failed with unknow error at: %1$s", playData));
+                return new PlaybookStatus("", "failed");
             }
-            status = Files.readString(Paths.get(String.format("%1$s/status", playData)));
-            rc = Files.readString(Paths.get(String.format("%1$s/rc", playData)));
         } catch (Exception e) {
             throw new AnsibleRunnerCallException(
                 String.format("Failed to read playbook result at: %1$s", playData), e);