Revert Set initial event number for async ansible commands oVirt#499

mnecas · Jun 28, 2022 · 3c101d7 · 3c101d7
1 parent fd071c7
commit 3c101d7
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 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
@@ -70,7 +70,7 @@ public void doPolling(Guid cmdId, List<Guid> childCmdIds) {
         // Process the events if the playbook is running:
         totalEvents = runnerClient.getTotalEvents(playUuid);
 
-        if (msg.equalsIgnoreCase("running") || totalEvents == 0 || msg.equalsIgnoreCase("successful")
+        if (msg.equalsIgnoreCase("running") || msg.equalsIgnoreCase("successful")
                 && command.getParameters().getLastEventId() < totalEvents) {
             command.getParameters().setLastEventId(runnerClient.processEvents(
                     playUuid, command.getParameters().getLastEventId(), fn, msg, ret.getLogFile()));

diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AnsibleCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AnsibleCommandBase.java
@@ -64,6 +64,7 @@ protected void executeCommand() {
         } else {
             getParameters().setPlayUuid(ansibleReturnValue.getPlayUuid());
             getParameters().setLogFile(ansibleReturnValue.getLogFile().toString());
+            getParameters().setLastEventId(ansibleReturnValue.getLastEventId());
             persistCommand(getParameters().getParentCommand(), true);
             setSucceeded(true);
         }

diff --git a/...es/common/src/main/java/org/ovirt/engine/core/common/action/AnsibleCommandParameters.java b/...es/common/src/main/java/org/ovirt/engine/core/common/action/AnsibleCommandParameters.java
@@ -18,7 +18,6 @@ public class AnsibleCommandParameters extends ActionParametersBase {
     public AnsibleCommandParameters() {
         super();
         this.playUuid = UUID.randomUUID().toString();
-        this.lastEventId = 0;
     }
 
     public int getLastEventId() {