Michael Kublin has uploaded a new change for review. Change subject: engine: Removed un needed calls to DB at VdsManager ......................................................................
engine: Removed un needed calls to DB at VdsManager The following patch is removing un needed queries to db, such query was retrieving VdsGroup from db. Reason: no reason, one time is enought. Change-Id: I8f6b3c214d0b5606b6bff3261d9a0ea6ed36a124 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 M backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfoTest.java 3 files changed, 5 insertions(+), 15 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/33/12433/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 79a4168..cdc6149 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 @@ -230,7 +230,7 @@ } if (isMonitoringNeeded()) { setStartTime(); - _vdsUpdater = new VdsUpdateRunTimeInfo(VdsManager.this, _vds); + _vdsUpdater = new VdsUpdateRunTimeInfo(VdsManager.this, _vds, monitoringStrategy); _vdsUpdater.Refresh(); mUnrespondedAttempts.set(0); setLastUpdate(); @@ -521,7 +521,6 @@ public VDSStatus refreshCapabilities(AtomicBoolean processHardwareCapsNeeded, VDS vds) { log.debug("GetCapabilitiesVDSCommand started method"); - MonitoringStrategy vdsMonitoringStrategy = MonitoringStrategyFactory.getMonitoringStrategyForVds(vds); VDS oldVDS = vds.clone(); GetCapabilitiesVDSCommand vdsBrokerCommand = new GetCapabilitiesVDSCommand( new VdsIdAndVdsVDSCommandParametersBase(vds)); @@ -563,7 +562,7 @@ // We process the software capabilities. VDSStatus oldStatus = vds.getStatus(); - vdsMonitoringStrategy.processSoftwareCapabilities(vds); + monitoringStrategy.processSoftwareCapabilities(vds); returnStatus = vds.getStatus(); if (returnStatus != oldStatus && returnStatus == VDSStatus.NonOperational) { 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 49916b4..f41a5b5 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 @@ -354,11 +354,11 @@ } } - public VdsUpdateRunTimeInfo(VdsManager vdsManager, VDS vds) { + public VdsUpdateRunTimeInfo(VdsManager vdsManager, VDS vds, MonitoringStrategy monitoringStrategy) { _vdsManager = vdsManager; _vds = vds; _firstStatus = _vds.getStatus(); - monitoringStrategy = getMonitoringStrategyForVds(vds); + this.monitoringStrategy = monitoringStrategy; _vmDict = getDbFacade().getVmDao().getAllRunningByVds(_vds.getId()); for (VM vm : _vmDict.values()) { @@ -366,10 +366,6 @@ runningVmsInTransition++; } } - } - - protected MonitoringStrategy getMonitoringStrategyForVds(VDS vds) { - return MonitoringStrategyFactory.getMonitoringStrategyForVds(vds); } public void Refresh() { 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 db89c84..f076f5b 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 @@ -65,16 +65,11 @@ public void setup() { initVds(); initConditions(); - updater = new VdsUpdateRunTimeInfo(null, vds) { + updater = new VdsUpdateRunTimeInfo(null, vds, mock(MonitoringStrategy.class)) { @Override public DbFacade getDbFacade() { return dbFacade; - } - - @Override - protected MonitoringStrategy getMonitoringStrategyForVds(VDS param) { - return mock(MonitoringStrategy.class); } @Override -- To view, visit http://gerrit.ovirt.org/12433 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8f6b3c214d0b5606b6bff3261d9a0ea6ed36a124 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
