Liron Aravot has uploaded a new change for review. Change subject: core: fix of job messages that uses SnapshotName object (#844283) ......................................................................
core: fix of job messages that uses SnapshotName object (#844283) https://bugzilla.redhat.com/844283 SnapshotName object was used in various snapshot related job messages while it was never initialized and declared as a vdc object type, this patch fixes this issue which makes the job messages informative with the correct snapshot name. Change-Id: I43e1de508e53eaf624fd7fb3de455a80003c5cd6 Signed-off-by: Liron Aravot <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreAllSnapshotsCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcObjectType.java M backend/manager/modules/dal/src/main/resources/bundles/ExecutionMessages.properties 6 files changed, 47 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/45/7745/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java index 225155b..54c0687 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java @@ -14,6 +14,7 @@ import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.PermissionSubject; import org.ovirt.engine.core.common.Quotable; +import org.ovirt.engine.core.common.VdcObjectType; import org.ovirt.engine.core.common.action.CreateAllSnapshotsFromVmParameters; import org.ovirt.engine.core.common.action.ImagesActionsParametersBase; import org.ovirt.engine.core.common.action.VdcActionType; @@ -58,6 +59,16 @@ setStoragePoolId(getVm().getstorage_pool_id()); } + @Override + public Map<String, String> getJobMessageProperties() { + if (jobProperties == null) { + jobProperties = super.getJobMessageProperties(); + jobProperties.put(VdcObjectType.SnapshotName.name().toLowerCase(), getParameters().getDescription()); + } + return jobProperties; + } + + /** * Filter all allowed snapshot disks. * @return list of disks to be snapshot. diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommand.java index 66175c8..a118d69 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommand.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.Map; +import org.apache.commons.lang.StringUtils; import org.ovirt.engine.core.bll.job.ExecutionHandler; import org.ovirt.engine.core.bll.snapshots.SnapshotsValidator; import org.ovirt.engine.core.common.AuditLogType; @@ -36,9 +37,11 @@ } private void initializeObjectState() { - Snapshot snapshot = getSnapshotDao().get(getParameters().getSnapshotId()); - if (snapshot != null) { - setSnapshotName(snapshot.getDescription()); + if (StringUtils.isEmpty(getSnapshotName())) { + Snapshot snapshot = getSnapshotDao().get(getParameters().getSnapshotId()); + if (snapshot != null) { + setSnapshotName(snapshot.getDescription()); + } } } @@ -46,7 +49,8 @@ public Map<String, String> getJobMessageProperties() { if (jobProperties == null) { jobProperties = super.getJobMessageProperties(); - jobProperties.put(VdcObjectType.Snapshot.name().toLowerCase(), getSnapshotName()); + initializeObjectState(); + jobProperties.put(VdcObjectType.SnapshotName.name().toLowerCase(), getSnapshotName()); } return jobProperties; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreAllSnapshotsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreAllSnapshotsCommand.java index 2358266..f1f64fe 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreAllSnapshotsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreAllSnapshotsCommand.java @@ -12,6 +12,7 @@ import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.PermissionSubject; import org.ovirt.engine.core.common.Quotable; +import org.ovirt.engine.core.common.VdcObjectType; import org.ovirt.engine.core.common.action.ImagesContainterParametersBase; import org.ovirt.engine.core.common.action.RemoveImageParameters; import org.ovirt.engine.core.common.action.RestoreAllSnapshotsParameters; @@ -283,6 +284,18 @@ } @Override + public Map<String, String> getJobMessageProperties() { + if (jobProperties == null) { + jobProperties = super.getJobMessageProperties(); + Snapshot snapshot = getSnapshotDao().get(getParameters().getDstSnapshotId()); + if (snapshot != null) { + jobProperties.put(VdcObjectType.SnapshotName.name().toLowerCase(), snapshot.getDescription()); + } + } + return jobProperties; + } + + @Override protected boolean canDoAction() { boolean result = false; if (!getSnapshotDao().exists(getVmId(), getParameters().getDstSnapshotId())) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.java index 050fd3c..8c3622a 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.java @@ -10,6 +10,7 @@ import org.ovirt.engine.core.bll.snapshots.SnapshotsManager; import org.ovirt.engine.core.bll.snapshots.SnapshotsValidator; import org.ovirt.engine.core.common.AuditLogType; +import org.ovirt.engine.core.common.VdcObjectType; import org.ovirt.engine.core.common.action.ImagesContainterParametersBase; import org.ovirt.engine.core.common.action.TryBackToAllSnapshotsOfVmParameters; import org.ovirt.engine.core.common.action.VdcActionType; @@ -52,6 +53,18 @@ } @Override + public Map<String, String> getJobMessageProperties() { + if (jobProperties == null) { + jobProperties = super.getJobMessageProperties(); + Snapshot snapshot = getSnapshotDao().get(getParameters().getDstSnapshotId()); + if (snapshot != null) { + jobProperties.put(VdcObjectType.SnapshotName.name().toLowerCase(), snapshot.getDescription()); + } + } + return jobProperties; + } + + @Override protected void EndWithFailure() { Guid previouslyActiveSnapshotId = getSnapshotDao().getId(getVmId(), SnapshotType.PREVIEW, SnapshotStatus.LOCKED); diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcObjectType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcObjectType.java index 46cc0b0..3d2be7d 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcObjectType.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcObjectType.java @@ -28,7 +28,7 @@ GlusterVolume(18, "Gluster Volume"), Disk(19, "Disk"), VmInterface(20, "VmInterface"), - Snapshot(20, "Snapshot"); + SnapshotName(20, "SnapshotName"); private int value; private String vdcObjectTranslationVal; diff --git a/backend/manager/modules/dal/src/main/resources/bundles/ExecutionMessages.properties b/backend/manager/modules/dal/src/main/resources/bundles/ExecutionMessages.properties index 17242fb..9ef8eb6 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/ExecutionMessages.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/ExecutionMessages.properties @@ -67,7 +67,7 @@ job.MaintananceVds=Moving Host ${VDS} to Maintenance job.VdsNotRespondingTreatment=Handling non responsive Host ${VDS} job.ReconstructMasterDomain=Reconstructing master domain on Data Center ${StoragePool} -job.RemoveSnapshot=Removing Snapshot ${Snapshot} of VM ${VM} +job.RemoveSnapshot=Removing Snapshot ${SnapshotName} of VM ${VM} # Step types step.VALIDATING=Validating -- To view, visit http://gerrit.ovirt.org/7745 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I43e1de508e53eaf624fd7fb3de455a80003c5cd6 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Liron Aravot <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
