Vered Volansky has uploaded a new change for review. Change subject: core: extract constant from HibernateVmCommand ......................................................................
core: extract constant from HibernateVmCommand META_DATA_SIZE_IN_BYTES was extracted to MemoryUtils due to use in several vm related commands, as well as need for it in another command in bz1119022 fix. Change-Id: I1604cf4a82e3e202093acdab97939427ab335169 Bug-Url: https://bugzilla.redhat.com/1119022 Signed-off-by: Vered Volansky <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/LiveSnapshotMemoryImageBuilder.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryUtils.java 5 files changed, 12 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/80/32180/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java index ee3d9c6..3604c5f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java @@ -10,6 +10,7 @@ import org.apache.commons.lang.StringUtils; import org.ovirt.engine.core.bll.context.EngineContext; +import org.ovirt.engine.core.bll.memory.MemoryUtils; import org.ovirt.engine.core.bll.snapshots.SnapshotsValidator; import org.ovirt.engine.core.bll.storage.StoragePoolValidator; import org.ovirt.engine.core.bll.utils.ClusterUtils; @@ -201,7 +202,7 @@ long sizeInBytes = 0; for (Snapshot snapshot : snapshotsWithMemory) { VM vm = getVmFromSnapshot(snapshot); - sizeInBytes += vm.getTotalMemorySizeInBytes() + HibernateVmCommand.META_DATA_SIZE_IN_BYTES; + sizeInBytes += vm.getTotalMemorySizeInBytes() + MemoryUtils.META_DATA_SIZE_IN_BYTES; } return (int) Math.ceil(1.0 * sizeInBytes / BYTES_IN_GB); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java index a5702e8..8305dea 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java @@ -47,10 +47,6 @@ private static final String SAVE_RAM_STATE_TASK_KEY = "SAVE_RAM_STATE_TASK_KEY"; private boolean isHibernateVdsProblematic = false; - /** The size for the snapshot's meta data which is vm related properties at the - * time the snapshot was taken */ - public static final long META_DATA_SIZE_IN_BYTES = 10 * 1024; - /** * Constructor for command creation when compensation is applied on startup * @@ -90,7 +86,8 @@ @Override public Guid getStorageDomainId() { if (_storageDomainId.equals(Guid.Empty) && getVm() != null) { - List<DiskImage> diskDummiesForMemSize = MemoryUtils.createDiskDummies(getVm().getTotalMemorySizeInBytes(), META_DATA_SIZE_IN_BYTES); + List<DiskImage> diskDummiesForMemSize = MemoryUtils.createDiskDummies(getVm().getTotalMemorySizeInBytes(), + MemoryUtils.META_DATA_SIZE_IN_BYTES); StorageDomain storageDomain = VmHandler.findStorageDomainForMemory(getVm().getStoragePoolId(), diskDummiesForMemSize); if (storageDomain != null) { _storageDomainId = storageDomain.getId(); @@ -175,7 +172,7 @@ new CreateImageVDSCommandParameters(getVm().getStoragePoolId(), getStorageDomainId(), image2GroupId, - META_DATA_SIZE_IN_BYTES, + MemoryUtils.META_DATA_SIZE_IN_BYTES, VolumeType.Sparse, VolumeFormat.COW, hiberVol2, diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java index a93a46f..79b902f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java @@ -482,7 +482,7 @@ VM vm = getVmFromSnapshot(snapshot); int requiredSizeForMemory = (int) Math.ceil((vm.getTotalMemorySizeInBytes() + - HibernateVmCommand.META_DATA_SIZE_IN_BYTES) * 1.0 / BYTES_IN_GB); + MemoryUtils.META_DATA_SIZE_IN_BYTES) * 1.0 / BYTES_IN_GB); StorageDomain storageDomain = VmHandler.findStorageDomainForMemory( getParameters().getStoragePoolId(), requiredSizeForMemory, domain2requiredSize); if (storageDomain == null) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/LiveSnapshotMemoryImageBuilder.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/LiveSnapshotMemoryImageBuilder.java index 3b131a8..60b6058 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/LiveSnapshotMemoryImageBuilder.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/LiveSnapshotMemoryImageBuilder.java @@ -68,7 +68,7 @@ storagePool.getId(), storageDomainId, vmConfImageGroupId, - HibernateVmCommand.META_DATA_SIZE_IN_BYTES, + MemoryUtils.META_DATA_SIZE_IN_BYTES, VolumeType.Sparse, VolumeFormat.COW, vmConfVolumeId, @@ -151,7 +151,7 @@ imageForMemory.setvolumeFormat(VolumeFormat.RAW); DiskImage imageForMetadata = DiskImage.copyOf(imageForMemory); - imageForMetadata.setSize(HibernateVmCommand.META_DATA_SIZE_IN_BYTES); + imageForMetadata.setSize(MemoryUtils.META_DATA_SIZE_IN_BYTES); imageForMetadata.setVolumeType(VolumeType.Sparse); imageForMetadata.setvolumeFormat(VolumeFormat.COW); return Arrays.asList(imageForMemory, imageForMetadata); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryUtils.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryUtils.java index 49480a4..879cbbc 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryUtils.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryUtils.java @@ -15,6 +15,10 @@ public class MemoryUtils { + /** The size for the snapshot's meta data which is vm related properties at the + * time the snapshot was taken */ + public static final long META_DATA_SIZE_IN_BYTES = 10 * 1024; + /** * Modified the given memory volume String representation to have the given storage * pool and storage domain -- To view, visit http://gerrit.ovirt.org/32180 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1604cf4a82e3e202093acdab97939427ab335169 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Vered Volansky <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
