Roy Golan has uploaded a new change for review. Change subject: core: rename var to fit the declared type ......................................................................
core: rename var to fit the declared type Change-Id: I3e6416515682f6ac15378db8b628306c8a1dcafa Signed-off-by: Roy Golan <[email protected]> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VmsMonitoring.java 1 file changed, 22 insertions(+), 22 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/92/37692/1 diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VmsMonitoring.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VmsMonitoring.java index 409f984..d4ae738 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VmsMonitoring.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VmsMonitoring.java @@ -185,54 +185,54 @@ Collection<Guid> movedToDownVms = new ArrayList<>(); // now loop over the result and act - for (VmAnalyzer vmUpdater : vmAnalyzers) { + for (VmAnalyzer vmAnalyzer : vmAnalyzers) { // rerun all vms from rerun list - if (vmUpdater.isRerun()) { - log.error("Rerun VM '{}'. Called from VDS '{}'", vmUpdater.getDbVm().getId(), vdsManager.getVdsName()); - ResourceManager.getInstance().RerunFailedCommand(vmUpdater.getDbVm().getId(), vdsManager.getVdsId()); + if (vmAnalyzer.isRerun()) { + log.error("Rerun VM '{}'. Called from VDS '{}'", vmAnalyzer.getDbVm().getId(), vdsManager.getVdsName()); + ResourceManager.getInstance().RerunFailedCommand(vmAnalyzer.getDbVm().getId(), vdsManager.getVdsId()); } - if (vmUpdater.isSuccededToRun()) { - vdsManager.succeededToRunVm(vmUpdater.getDbVm().getId()); + if (vmAnalyzer.isSuccededToRun()) { + vdsManager.succeededToRunVm(vmAnalyzer.getDbVm().getId()); //TODO change {@IVdsEventListener.updateSlaPolicies} // to varargs version to avoid creating the list // over and over again - updateSlaPolicies(Guid vdsId, Guid... vmIds) getVdsEventListener().updateSlaPolicies( - Arrays.asList(new Guid[] { vmUpdater.getDbVm().getId() }), + Arrays.asList(new Guid[] { vmAnalyzer.getDbVm().getId() }), vdsManager.getVdsId()); } // Refrain from auto-start HA VM during its re-run attempts. - if (vmUpdater.isAutoVmToRun() && !vmUpdater.isRerun()) { - autoVmsToRun.add(vmUpdater.getDbVm().getId()); + if (vmAnalyzer.isAutoVmToRun() && !vmAnalyzer.isRerun()) { + autoVmsToRun.add(vmAnalyzer.getDbVm().getId()); } // process all vms that their ip changed. - if (vmUpdater.isClientIpChanged()) { - getVdsEventListener().processOnClientIpChange(vmUpdater.getVdsmVm().getVmDynamic().getId()); + if (vmAnalyzer.isClientIpChanged()) { + getVdsEventListener().processOnClientIpChange(vmAnalyzer.getVdsmVm().getVmDynamic().getId()); } // process all vms that powering up. - if (vmUpdater.isPoweringUp()) { - getVdsEventListener().processOnVmPoweringUp(vmUpdater.getVdsmVm().getVmDynamic().getId()); + if (vmAnalyzer.isPoweringUp()) { + getVdsEventListener().processOnVmPoweringUp(vmAnalyzer.getVdsmVm().getVmDynamic().getId()); } - if (vmUpdater.isMovedToDown()) { - movedToDownVms.add(vmUpdater.getDbVm().getId()); + if (vmAnalyzer.isMovedToDown()) { + movedToDownVms.add(vmAnalyzer.getDbVm().getId()); } - if (vmUpdater.isRemoveFromAsync()) { - ResourceManager.getInstance().RemoveAsyncRunningVm(vmUpdater.getDbVm().getId()); + if (vmAnalyzer.isRemoveFromAsync()) { + ResourceManager.getInstance().RemoveAsyncRunningVm(vmAnalyzer.getDbVm().getId()); } - if (vmUpdater.isExternalVm()) { - externalVms.add(new Pair<>(vmUpdater.getDbVm(), vmUpdater.getVdsmVm())); + if (vmAnalyzer.isExternalVm()) { + externalVms.add(new Pair<>(vmAnalyzer.getDbVm(), vmAnalyzer.getVdsmVm())); } - if (!vmUpdater.getUpdatedLuns().isEmpty()) { - vmUpdater.getUpdatedLuns().addAll(vmLunDisksToSave); - vmLunDisksToSave = vmUpdater.getUpdatedLuns(); + if (!vmAnalyzer.getUpdatedLuns().isEmpty()) { + vmAnalyzer.getUpdatedLuns().addAll(vmLunDisksToSave); + vmLunDisksToSave = vmAnalyzer.getUpdatedLuns(); } } -- To view, visit http://gerrit.ovirt.org/37692 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3e6416515682f6ac15378db8b628306c8a1dcafa Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Roy Golan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
