Michael Kublin has uploaded a new change for review. Change subject: engine: Improving update of vds dynamic data - status ......................................................................
engine: Improving update of vds dynamic data - status Instead of updating all vds dynamic data we can update only its status Change-Id: I59c0c1c34c7c9ddcb481fda17decc91875eb1638 Signed-off-by: Michael Kublin <[email protected]> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/ResourceManager.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java 2 files changed, 4 insertions(+), 12 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/57/13657/1 diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/ResourceManager.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/ResourceManager.java index ac3dc4c..a877c2f 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/ResourceManager.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/ResourceManager.java @@ -13,7 +13,6 @@ import org.ovirt.engine.core.common.businessentities.VDSStatus; import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.core.common.businessentities.VMStatus; -import org.ovirt.engine.core.common.businessentities.VdsDynamic; import org.ovirt.engine.core.common.businessentities.VdsStatistics; import org.ovirt.engine.core.common.businessentities.VmExitStatus; import org.ovirt.engine.core.common.businessentities.VmPauseStatus; @@ -291,13 +290,6 @@ statistics.setTransmitRate(0D); statistics.setReceiveRate(0D); statistics.setReceiveDropRate(0D); - } - } - - public void UpdateVdsDynamicData(VdsDynamic vdsDynamic) { - VdsManager vdsManager = GetVdsManager(vdsDynamic.getId()); - if (vdsManager != null) { - vdsManager.UpdateDynamicData(vdsDynamic); } } 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 dd10aec..5f0e602 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 @@ -323,7 +323,7 @@ private void HandleVdsRecoveringException(VDSRecoveringException ex) { if (_vds.getStatus() != VDSStatus.Initializing && _vds.getStatus() != VDSStatus.NonOperational) { setStatus(VDSStatus.Initializing, _vds); - UpdateDynamicData(_vds.getDynamicData()); + DbFacade.getInstance().getVdsDynamicDao().updateStatus(_vds.getId(), VDSStatus.Initializing); AuditLogableBase logable = new AuditLogableBase(_vds.getId()); logable.addCustomValue("ErrorMessage", ex.getMessage()); AuditLogDirector.log(logable, AuditLogType.VDS_INITIALIZING); @@ -490,10 +490,10 @@ if (mFailedToRunVmAttempts.get() < Config.<Integer> GetValue(ConfigValues.NumberOfFailedRunsOnVds) && vds.getStatus() == VDSStatus.Error) { setStatus(VDSStatus.Up, vds); - UpdateDynamicData(vds.getDynamicData()); + DbFacade.getInstance().getVdsDynamicDao().updateStatus(getVdsId(), VDSStatus.Up); } - log.infoFormat("OnVdsDuringFailureTimer of vds {0} entered. Time:{1}. Attempts after {2}", vds.getName(), - new java.util.Date(), mFailedToRunVmAttempts); + log.infoFormat("OnVdsDuringFailureTimer of vds {0} entered. Attempts after {1}", vds.getName(), + mFailedToRunVmAttempts); } } -- To view, visit http://gerrit.ovirt.org/13657 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I59c0c1c34c7c9ddcb481fda17decc91875eb1638 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
