Arik Hadas has uploaded a new change for review. Change subject: core: change _poweringUpVms to contain Guids ......................................................................
core: change _poweringUpVms to contain Guids No need to hold the whole dynamic part of VMs that were powering up, we only need their IDs. Change-Id: I109555bc6014ae93038ce5adf8a7cc246e7c1bfe Signed-off-by: Arik Hadas <[email protected]> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java M backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfoTest.java 2 files changed, 11 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/20/32120/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 e47103e..27c51ec 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 @@ -108,7 +108,7 @@ private final List<Guid> existingVmJobIds = new ArrayList<>(); private final Map<VM, VmDynamic> _vmsClientIpChanged = new HashMap<>(); private final Map<Guid, List<VmGuestAgentInterface>> vmGuestAgentNics = new HashMap<>(); - private final List<VmDynamic> _poweringUpVms = new ArrayList<>(); + private final List<Guid> _poweringUpVms = new ArrayList<>(); private final List<Guid> _vmsToRerun = new ArrayList<>(); private final List<Guid> _autoVmsToRun = new ArrayList<>(); private final Set<Guid> _vmsMovedToDown = new HashSet<>(); @@ -579,8 +579,8 @@ } // process all vms that powering up. - for (VmDynamic runningVm : _poweringUpVms) { - getVdsEventListener().processOnVmPoweringUp(runningVm.getId()); + for (Guid vmId : _poweringUpVms) { + getVdsEventListener().processOnVmPoweringUp(vmId); } // process all vms that went down @@ -1029,8 +1029,8 @@ protected void updateLunDisks() { // Looping only over powering up VMs as LUN device size // is updated by VDSM only once when running a VM. - for (VmDynamic vmDynamic : getPoweringUpVms()) { - VmInternalData vmInternalData = getRunningVms().get(vmDynamic.getId()); + for (Guid vmId : getPoweringUpVms()) { + VmInternalData vmInternalData = getRunningVms().get(vmId); if (vmInternalData != null) { Map<String, LUNs> lunsMap = vmInternalData.getLunsMap(); if (lunsMap.isEmpty()) { @@ -1038,7 +1038,7 @@ continue; } - List<Disk> vmDisks = getDbFacade().getDiskDao().getAllForVm(vmDynamic.getId(), true); + List<Disk> vmDisks = getDbFacade().getDiskDao().getAllForVm(vmId, true); for (Disk disk : vmDisks) { if (disk.getDiskStorageType() != DiskStorageType.LUN) { continue; @@ -1731,7 +1731,7 @@ // Vm moved to powering Up or up status - launch spice // if no current client ip already connected. if (runningVm.getDisplay() != null) { - _poweringUpVms.add(runningVm); + _poweringUpVms.add(runningVm.getId()); } else { log.error("UpdateRepository - runningVm.display is null, cannot start spice for it"); } @@ -2209,7 +2209,7 @@ return Collections.unmodifiableList(vmLunDisksToSave); } - protected List<VmDynamic> getPoweringUpVms() { + protected List<Guid> getPoweringUpVms() { return _poweringUpVms; } diff --git a/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfoTest.java b/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfoTest.java index c36ef92..59aa508 100644 --- a/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfoTest.java +++ b/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfoTest.java @@ -75,7 +75,7 @@ private VDS vds; HashMap[] vmInfo; - List<VmDynamic> poweringUpVms; + List<Guid> poweringUpVms; VdsUpdateRunTimeInfo updater; @@ -138,7 +138,7 @@ } @Override - protected List<VmDynamic> getPoweringUpVms() { + protected List<Guid> getPoweringUpVms() { return poweringUpVms; } }); @@ -218,7 +218,7 @@ when(diskDAO.getAllForVm(any(Guid.class), any(Boolean.class))).thenReturn(vmLunDisksFromDb); when(updater.getRunningVms()).thenReturn(Collections.singletonMap(vmId, vmInternalData)); - poweringUpVms = Collections.singletonList(vmDynamic); + poweringUpVms = Collections.singletonList(vmId); updater.updateLunDisks(); } -- To view, visit http://gerrit.ovirt.org/32120 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I109555bc6014ae93038ce5adf8a7cc246e7c1bfe 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
