Idan Shaby has uploaded a new change for review. Change subject: core: log the selected storage domain for memory volumes ......................................................................
core: log the selected storage domain for memory volumes This patch adds an info log for the storage domain that was selected to store the vm's memory volumes. Change-Id: I8c06e7eaa880c690ef2926b7d41155baaf24518d Bug-Url: https://bugzilla.redhat.com/1186230 Signed-off-by: Idan Shaby <ish...@redhat.com> --- 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/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/MemoryStorageHandler.java 4 files changed, 13 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/43/42143/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 e8c0e57..abee6f6 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 @@ -253,7 +253,7 @@ public Guid getStorageDomainIdForVmMemory(List<DiskImage> memoryDisksList) { if (cachedStorageDomainId.equals(Guid.Empty) && getVm() != null) { StorageDomain storageDomain = MemoryStorageHandler.getInstance().findStorageDomainForMemory( - getVm().getStoragePoolId(), memoryDisksList, getDisksList()); + getVm().getStoragePoolId(), memoryDisksList, getDisksList(), getVm()); if (storageDomain != null) { cachedStorageDomainId = storageDomain.getId(); } 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 573c59f..a8eeb4f 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 @@ -84,7 +84,7 @@ MemoryUtils.META_DATA_SIZE_IN_BYTES); StorageDomain storageDomain = MemoryStorageHandler.getInstance().findStorageDomainForMemory( getStoragePoolId(), diskDummiesForMemSize, - ImagesHandler.filterImageDisks(getDiskDao().getAllForVm(getVmId()), false, false, false)); + ImagesHandler.filterImageDisks(getDiskDao().getAllForVm(getVmId()), false, false, false), getVm()); if (storageDomain != null) { cachedStorageDomainId = storageDomain.getId(); } 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 1b7b0e0..ca67b70 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 @@ -487,7 +487,7 @@ private StorageDomain updateStorageDomainInMemoryVolumes(List<DiskImage> disksList) { List<DiskImage> memoryDisksList = MemoryUtils.createDiskDummies(getVm().getTotalMemorySizeInBytes(), MemoryUtils.META_DATA_SIZE_IN_BYTES); StorageDomain storageDomain = MemoryStorageHandler.getInstance().findStorageDomainForMemory( - getParameters().getStoragePoolId(), memoryDisksList, getVmDisksDummies()); + getParameters().getStoragePoolId(), memoryDisksList, getVmDisksDummies(), getVm()); disksList.addAll(memoryDisksList); return storageDomain; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryStorageHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryStorageHandler.java index 41a9083..0765928 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryStorageHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryStorageHandler.java @@ -16,22 +16,28 @@ import org.ovirt.engine.core.bll.memory.sdcomparators.StorageDomainNumberOfVmDisksComparator; import org.ovirt.engine.core.bll.memory.sdcomparators.StorageTypeComparator; import org.ovirt.engine.core.common.businessentities.StorageDomain; +import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.core.common.businessentities.storage.DiskImage; import org.ovirt.engine.core.common.businessentities.storage.StorageType; import org.ovirt.engine.core.common.businessentities.storage.VolumeType; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.dbbroker.DbFacade; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class MemoryStorageHandler { private static final MemoryStorageHandler instance = new MemoryStorageHandler(); private MemoryStorageHandler() { + log = LoggerFactory.getLogger(getClass()); } public static MemoryStorageHandler getInstance() { return instance; } + + private Logger log; /** * Returns a <code>StorageDomain</code> in the given <code>StoragePool</code> that has @@ -47,12 +53,15 @@ * or null if no such storage domain exists in the pool */ public StorageDomain findStorageDomainForMemory(Guid storagePoolId, List<DiskImage> memoryDisks, - Collection<DiskImage> vmDisks) { + Collection<DiskImage> vmDisks, VM vm) { List<StorageDomain> domainsInPool = DbFacade.getInstance().getStorageDomainDao().getAllForStoragePool(storagePoolId); StorageDomain storageDomainForMemory = findStorageDomainForMemory(domainsInPool, memoryDisks, vmDisks); if (storageDomainForMemory != null) { updateDisksStorage(storageDomainForMemory, memoryDisks); + log.info("The memory volumes of vm (name '{}', id '{}') will be " + + "stored in storage domain (name '{}', id '{}')", + vm.getName(), vm.getId(), storageDomainForMemory.getName(), storageDomainForMemory.getId()); } return storageDomainForMemory; } -- To view, visit https://gerrit.ovirt.org/42143 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8c06e7eaa880c690ef2926b7d41155baaf24518d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Idan Shaby <ish...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
