Alon Bar-Lev has uploaded a new change for review. Change subject: host-deploy: lock vds when installing ......................................................................
host-deploy: lock vds when installing Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=995501 Change-Id: I6bbd1102e85d30176c123ebb1999522a667c4e47 Signed-off-by: Alon Bar-Lev <alo...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsCommand.java 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/28/17928/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsCommand.java index d265d93..6f4a3d4 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsCommand.java @@ -1,6 +1,8 @@ package org.ovirt.engine.core.bll; import java.io.File; +import java.util.Collections; +import java.util.Map; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.exception.ExceptionUtils; @@ -16,6 +18,8 @@ import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.errors.VdcBllMessages; +import org.ovirt.engine.core.common.locks.LockingGroup; +import org.ovirt.engine.core.common.utils.Pair; import org.ovirt.engine.core.common.vdscommands.SetVdsStatusVDSCommandParameters; import org.ovirt.engine.core.common.vdscommands.VDSCommandType; import org.ovirt.engine.core.compat.Guid; @@ -25,6 +29,7 @@ import org.ovirt.engine.core.utils.log.LogFactory; import org.ovirt.engine.core.vdsbroker.vdsbroker.VDSNetworkException; +@LockIdNameAttribute @NonTransactiveCommandAttribute public class InstallVdsCommand<T extends InstallVdsParameters> extends VdsCommand<T> { @@ -101,6 +106,17 @@ } } + @Override + protected Map<String, Pair<String, String>> getExclusiveLocks() { + return Collections.singletonMap( + getParameters().getVdsId().toString(), + LockMessagesMatchUtil.makeLockingPair( + LockingGroup.VDS, + VdcBllMessages.ACTION_TYPE_FAILED_OBJECT_LOCKED + ) + ); + } + private void installHost() { VdsDeploy installer = null; try { -- To view, visit http://gerrit.ovirt.org/17928 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6bbd1102e85d30176c123ebb1999522a667c4e47 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.3 Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
