Arik Hadas has uploaded a new change for review. Change subject: core: cleanup in VURTI ......................................................................
core: cleanup in VURTI - improve log printings - call getVdsEventListener to shorten few lines Change-Id: I4a0b6ab3ee60e96e9863e56d2a7d4b40a585b9fc Signed-off-by: Arik Hadas <[email protected]> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java 1 file changed, 8 insertions(+), 16 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/11/31611/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 5b2f8eb..08b0fbf 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 @@ -493,9 +493,7 @@ if (log.isDebugEnabled()) { log.debugFormat("vds {0}-{1} firing up event.", _vds.getId(), _vds.getName()); } - _vdsManager.setIsSetNonOperationalExecuted(!ResourceManager.getInstance() - .getEventListener() - .vdsUpEvent(_vds)); + _vdsManager.setIsSetNonOperationalExecuted(!getVdsEventListener().vdsUpEvent(_vds)); } // save all data to db saveDataToDb(); @@ -549,10 +547,7 @@ } else if (_vds.getStatus() == VDSStatus.NonOperational && _firstStatus != VDSStatus.NonOperational) { if (!_vdsManager.isSetNonOperationalExecuted()) { - ResourceManager - .getInstance() - .getEventListener() - .vdsNonOperational(_vds.getId(), _vds.getNonOperationalReason(), true, Guid.Empty); + getVdsEventListener().vdsNonOperational(_vds.getId(), _vds.getNonOperationalReason(), true, Guid.Empty); } else { log.infoFormat("Host {0} : {1} is already in NonOperational status for reason {2}. SetNonOperationalVds command is skipped.", @@ -584,11 +579,8 @@ // process all vms that powering up. for (VmDynamic runningVm : _poweringUpVms) { - ResourceManager - .getInstance() - .getEventListener() - .processOnVmPoweringUp(_vds.getId(), runningVm.getId(), runningVm.getDisplayIp(), - runningVm.getDisplay()); + getVdsEventListener().processOnVmPoweringUp(_vds.getId(), runningVm.getId(), + runningVm.getDisplayIp(), runningVm.getDisplay()); } // process all vms that went down @@ -598,12 +590,12 @@ ResourceManager.getInstance().RemoveAsyncRunningVm(vm_guid); } } catch (IRSErrorException ex) { - logFailureMessage("ResourceManager::RerunFailedCommand:", ex); + logFailureMessage("Could not finish afterRefreshTreatment", ex); if (log.isDebugEnabled()) { log.error(ExceptionUtils.getMessage(ex), ex); } } catch (RuntimeException ex) { - logFailureMessage("ResourceManager::RerunFailedCommand:", ex); + logFailureMessage("Could not finish afterRefreshTreatment", ex); log.error(ExceptionUtils.getMessage(ex), ex); } } @@ -677,7 +669,7 @@ GetStatsVDSCommand<VdsIdAndVdsVDSCommandParametersBase> vdsBrokerCommand = new GetStatsVDSCommand<VdsIdAndVdsVDSCommandParametersBase>(new VdsIdAndVdsVDSCommandParametersBase(_vds)); vdsBrokerCommand.execute(); - ResourceManager.getInstance().getEventListener().updateSchedulingStats(_vds); + getVdsEventListener().updateSchedulingStats(_vds); if (!vdsBrokerCommand.getVDSReturnValue().getSucceeded() && vdsBrokerCommand.getVDSReturnValue().getExceptionObject() != null) { VDSNetworkException ex = @@ -1916,7 +1908,7 @@ runningVm.getId(), _vds.getName()); returnValue = true; - } else if ((vmToUpdate == null && runningVm.getStatus() != VMStatus.MigratingFrom)) { + } else if (vmToUpdate == null && runningVm.getStatus() != VMStatus.MigratingFrom) { // check if the vm exists on another vds VmDynamic vmDynamic = getDbFacade().getVmDynamicDao().get(runningVm.getId()); if (vmDynamic != null && vmDynamic.getRunOnVds() != null -- To view, visit http://gerrit.ovirt.org/31611 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4a0b6ab3ee60e96e9863e56d2a7d4b40a585b9fc 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
