Moti Asayag has uploaded a new change for review. Change subject: engine: Do not invoke CommitNetworkChanges if not needed ......................................................................
engine: Do not invoke CommitNetworkChanges if not needed There is no reason to sent persist network changes if no changes were detected via setupNetworks. Change-Id: Ie06d43ffaf899af4749bb1221764d40fab10a572 Bug-Url: https://bugzilla.redhat.com/1061724 Signed-off-by: Moti Asayag <masa...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/PersistentSetupNetworksCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksCommand.java 2 files changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/23/24123/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/PersistentSetupNetworksCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/PersistentSetupNetworksCommand.java index 8bce18c..e111ce0 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/PersistentSetupNetworksCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/PersistentSetupNetworksCommand.java @@ -2,6 +2,7 @@ import org.ovirt.engine.core.bll.NonTransactiveCommandAttribute; import org.ovirt.engine.core.bll.VdsCommand; +import org.ovirt.engine.core.bll.network.host.SetupNetworksCommand.SETUP_NETWORKS_RESOLUTION; import org.ovirt.engine.core.common.action.SetupNetworksParameters; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.action.VdcReturnValueBase; @@ -25,7 +26,8 @@ @Override protected void executeCommand() { VdcReturnValueBase returnValue = getBackend().runInternalAction(VdcActionType.SetupNetworks, getParameters()); - if (returnValue.getSucceeded()) { + if (returnValue.getSucceeded() + && SETUP_NETWORKS_RESOLUTION.NO_CHANGES_DETECTED != returnValue.getActionReturnValue()) { returnValue = getBackend().runInternalAction(VdcActionType.CommitNetworkChanges, new VdsActionParameters(getParameters().getVdsId())); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksCommand.java index e8cc40c..3225ee3 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksCommand.java @@ -36,6 +36,9 @@ @NonTransactiveCommandAttribute public class SetupNetworksCommand<T extends SetupNetworksParameters> extends VdsCommand<T> { + public static enum SETUP_NETWORKS_RESOLUTION { + NO_CHANGES_DETECTED; + }; /** Time between polling attempts, to prevent flooding the host/network. */ private static final long POLLING_BREAK = 500; private static final List<VDSStatus> SUPPORTED_HOST_STATUSES = @@ -89,6 +92,11 @@ updateModifiedInterfaces(); } + log.infoFormat("No changes were detected in setup networks for host {0} (ID: {1})", + getVdsName(), + getVdsId()); + + setActionReturnValue(SETUP_NETWORKS_RESOLUTION.NO_CHANGES_DETECTED); setSucceeded(true); return; } -- To view, visit http://gerrit.ovirt.org/24123 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie06d43ffaf899af4749bb1221764d40fab10a572 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Moti Asayag <masa...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
