Arik Hadas has uploaded a new change for review. Change subject: core: mark default locking pairs as Deprecated ......................................................................
core: mark default locking pairs as Deprecated LockMessagesMatchUtil contains several pairs of locking group and error message to display when the lock cannot be acquired. this patch mark those pairs as Deprecated as they shouldn't be used for new locks and should be replaced bit by bit with pairs that include more informative error message. Change-Id: Ic24c713bb1f38f32a4109b951131b47da20345ea Signed-off-by: Arik Hadas <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LockMessagesMatchUtil.java 1 file changed, 19 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/12/13312/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LockMessagesMatchUtil.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LockMessagesMatchUtil.java index e72be6b..a7bed20 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LockMessagesMatchUtil.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LockMessagesMatchUtil.java @@ -6,18 +6,37 @@ public class LockMessagesMatchUtil { + /** + * The following fields are pairs of locking group and the default error message which was shown + * when lock cannot be acquire. those fields are here for backward compatibility reasons and + * should not be used for new locks - new pair with more informative error message should be + * created instead + */ + @Deprecated public static final Pair<String, String> POOL = makeLockingPair(LockingGroup.POOL); + @Deprecated public static final Pair<String, String> VDS = makeLockingPair(LockingGroup.VDS); + @Deprecated public static final Pair<String, String> VDS_FENCE = makeLockingPair(LockingGroup.VDS_FENCE); + @Deprecated public static final Pair<String, String> VM = makeLockingPair(LockingGroup.VM); + @Deprecated public static final Pair<String, String> TEMPLATE = makeLockingPair(LockingGroup.TEMPLATE); + @Deprecated public static final Pair<String, String> DISK = makeLockingPair(LockingGroup.DISK); + @Deprecated public static final Pair<String, String> VM_DISK_BOOT = makeLockingPair(LockingGroup.VM_DISK_BOOT); + @Deprecated public static final Pair<String, String> VM_NAME = makeLockingPair(LockingGroup.VM_NAME); + @Deprecated public static final Pair<String, String> STORAGE = makeLockingPair(LockingGroup.STORAGE); + @Deprecated public static final Pair<String, String> REGISTER_VDS = makeLockingPair(LockingGroup.REGISTER_VDS); + @Deprecated public static final Pair<String, String> VM_SNAPSHOTS = makeLockingPair(LockingGroup.VM_SNAPSHOTS); + @Deprecated public static final Pair<String, String> GLUSTER = makeLockingPair(LockingGroup.GLUSTER); + @Deprecated public static final Pair<String, String> USER_VM_POOL = makeLockingPair(LockingGroup.USER_VM_POOL); /** -- To view, visit http://gerrit.ovirt.org/13312 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic24c713bb1f38f32a4109b951131b47da20345ea Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Arik Hadas <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
