Michael Kublin has uploaded a new change for review. Change subject: engine: Remove a dead code from VdsManager ......................................................................
engine: Remove a dead code from VdsManager The following condition was removed from VdsManager because it will necer be true. _vdsUpdater is cleaned usually before realising a lock inside a VdsManager and exit of critical section. The method UpdateVmDynamic is usually called under lock of VdsManger, so always _vdsUpdater will be null. The method from VdsUpdateRuntimeInfo not in use anymore - tat's why removed. Change-Id: Ib79757485afc1cdcb505b10030b68c0d15a50fdb Signed-off-by: Michael Kublin <[email protected]> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java 2 files changed, 0 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/74/9374/1 diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java index 6353288..af627bd 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java @@ -14,7 +14,6 @@ import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.VDSDomainsData; import org.ovirt.engine.core.common.businessentities.VDSStatus; -import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.core.common.businessentities.VdsDynamic; import org.ovirt.engine.core.common.businessentities.VdsStatistics; import org.ovirt.engine.core.common.businessentities.VmDynamic; @@ -184,12 +183,6 @@ } public void UpdateVmDynamic(VmDynamic vmDynamic) { - if (_vdsUpdater != null) { - VM vm = _vdsUpdater.GetVmFromDictionary(vmDynamic.getId()); - if (vm != null) { - vm.setDynamicData(vmDynamic); - } - } DbFacade.getInstance().getVmDynamicDao().update(vmDynamic); } 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 f5cebaa..06f69c9 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 @@ -106,12 +106,6 @@ private static Map<Guid, Long> hostDownTimes = new HashMap<Guid, Long>(); private int runningVmsInTransition = 0; - public VM GetVmFromDictionary(Guid id) { - VM vm = null; - vm = _vmDict.get(id); - return vm; - } - private void SaveDataToDb() { if (_saveVdsDynamic) { _vdsManager.UpdateDynamicData(_vds.getDynamicData()); -- To view, visit http://gerrit.ovirt.org/9374 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib79757485afc1cdcb505b10030b68c0d15a50fdb Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Michael Kublin <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
