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 index 30b732eb39f..3c170dc41f9 100644 --- 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 @@ -11,8 +11,6 @@ import org.ovirt.engine.core.bll.tasks.interfaces.CommandCallback; import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.action.AnsibleCommandParameters; -import org.ovirt.engine.core.common.utils.ansible.AnsibleReturnCode; -import org.ovirt.engine.core.common.utils.ansible.AnsibleReturnValue; import org.ovirt.engine.core.common.utils.ansible.AnsibleRunnerClient; import org.ovirt.engine.core.common.utils.ansible.AnsibleRunnerLogger; import org.ovirt.engine.core.compat.CommandStatus; @@ -59,8 +57,6 @@ public void doPolling(Guid cmdId, List childCmdIds) { } }; - AnsibleReturnValue ret = new AnsibleReturnValue(AnsibleReturnCode.ERROR); - ret.setLogFile(runnerClient.getLogger().getLogFile()); int totalEvents; // Get the current status of the playbook: AnsibleRunnerClient.PlaybookStatus playbookStatus = runnerClient.getPlaybookStatus(playUuid); @@ -72,13 +68,12 @@ public void doPolling(Guid cmdId, List childCmdIds) { if (msg.equalsIgnoreCase("running") || msg.equalsIgnoreCase("successful") && command.getParameters().getLastEventId() < totalEvents) { command.getParameters().setLastEventId(runnerClient.processEvents( - playUuid, command.getParameters().getLastEventId(), fn, msg, ret.getLogFile())); + playUuid, command.getParameters().getLastEventId(), fn)); return; } else if (msg.equalsIgnoreCase("successful")) { log.info("Playbook (Play uuid = {}, command = {}) has completed!", command.getParameters().getPlayUuid(), command.getActionType().name()); // Exit the processing if playbook finished: - ret.setAnsibleReturnCode(AnsibleReturnCode.OK); command.setSucceeded(true); command.setCommandStatus(CommandStatus.SUCCEEDED); } else { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/common/utils/ansible/AnsibleExecutor.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/common/utils/ansible/AnsibleExecutor.java index a4fc1977e52..f6e8508b2b8 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/common/utils/ansible/AnsibleExecutor.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/common/utils/ansible/AnsibleExecutor.java @@ -149,7 +149,6 @@ public AnsibleReturnValue runCommand(AnsibleCommandConfig commandConfig, int tim AnsibleReturnValue ret = new AnsibleReturnValue(AnsibleReturnCode.ERROR); String playUuid = null; - String msg = ""; AnsibleRunnerClient runnerClient = null; try { runnerClient = ansibleClientFactory.create(commandConfig); @@ -182,7 +181,7 @@ public AnsibleReturnValue runCommand(AnsibleCommandConfig commandConfig, int tim } finally { // Make sure all events are proccessed even in case of failure: if (playUuid != null && runnerClient != null && !async) { - runnerClient.processEvents(playUuid, ret.getLastEventId(), fn, msg, ret.getLogFile()); + runnerClient.processEvents(playUuid, ret.getLastEventId(), fn); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/common/utils/ansible/AnsibleRunnerClient.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/common/utils/ansible/AnsibleRunnerClient.java index c01a330094e..3866d484092 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/common/utils/ansible/AnsibleRunnerClient.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/common/utils/ansible/AnsibleRunnerClient.java @@ -9,7 +9,6 @@ import java.io.IOException; import java.nio.charset.StandardCharsets; import java.nio.file.Files; -import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; import java.util.HashSet; @@ -64,7 +63,7 @@ public AnsibleReturnValue artifactHandler(UUID uuid, int lastEventID, int timeou int executionTime = 0; setReturnValue(uuid); while (!playHasEnded(uuid.toString(), lastEventID)) { - lastEventID = processEvents(uuid.toString(), lastEventID, fn, "", Paths.get("")); + lastEventID = processEvents(uuid.toString(), lastEventID, fn); if (lastEventID == -1) { return returnValue; } @@ -108,9 +107,7 @@ public String getJobEventsDir(String playUuid) { public int processEvents(String playUuid, int lastEventId, - BiConsumer fn, - String msg, - Path logFile) { + BiConsumer fn) { String jobEvents = getJobEventsDir(playUuid); while(true){ // get next event