Vered Volansky has uploaded a new change for review. Change subject: core: disk_image_dynamic statistics (#892596) ......................................................................
core: disk_image_dynamic statistics (#892596) vdsm sends disk statisticd per disk, while disk_image_dynamic table contains disk_image ids (volumes). Hence the update on disk ids that VdsUpdateRunTimeInfo generates, actually does nothing. A quick fix for this problem is that VdsUpdateRunTimeInfo now updates by the AI id, so statistics are saved. Change-Id: I9f49238e3a725184ad2feb2d5ff06996e462d377 Bug-Url: https://bugzilla.redhat.com/892596 Signed-off-by: Vered Volansky <[email protected]> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/61/12961/1 diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java index 36bc4e2..10d4772 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java @@ -17,6 +17,8 @@ import org.apache.commons.lang.exception.ExceptionUtils; import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.businessentities.BusinessEntity; +import org.ovirt.engine.core.common.businessentities.Disk; +import org.ovirt.engine.core.common.businessentities.DiskImage; import org.ovirt.engine.core.common.businessentities.DiskImageDynamic; import org.ovirt.engine.core.common.businessentities.Entities; import org.ovirt.engine.core.common.businessentities.VDS; @@ -1701,7 +1703,15 @@ updateInterfaceStatistics(vmToUpdate, vmStatistics); for (DiskImageDynamic imageDynamic : _runningVms.get(vmToUpdate.getId()).getVmDynamic().getDisks()) { - _vmDiskImageDynamicToSave.put(imageDynamic.getId(), imageDynamic); + Disk disk = getDbFacade().getDiskDao().get(imageDynamic.getId()); + //We have disk_id statistics, which is good, but disk_image_dynamic table contains image_id, so we update for the AI. + if (disk instanceof DiskImage) + { + DiskImage diskImage = (DiskImage) disk; + Guid ActiveImageId = diskImage.getImageId(); + imageDynamic.setId(ActiveImageId); + _vmDiskImageDynamicToSave.put(ActiveImageId, imageDynamic); + } } } } -- To view, visit http://gerrit.ovirt.org/12961 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9f49238e3a725184ad2feb2d5ff06996e462d377 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Vered Volansky <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
