Arik Hadas has uploaded a new change for review. Change subject: core: minor cleanup in VdsUpdateRunTimeInfo ......................................................................
core: minor cleanup in VdsUpdateRunTimeInfo - Replace documentation comments within methods with single line comments. - Replace fields initializations which consist of two consecutive statements - one for declaration + null assignment and another one for value assignment, with one initialization statement which include the field declaration plus value assignment. Change-Id: I21cc745d9034cbf97b1d39ad65a96c30c01e7dd2 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(+), 21 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/05/10705/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 d9f1077..5683c2d 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 @@ -485,9 +485,7 @@ } // save also dynamic because vm_count data and image_check getting with // statistics data - /** - * TODO: omer- one day remove dynamic save when possible please check if vdsDynamic changed before save - */ + // TODO: omer- one day remove dynamic save when possible please check if vdsDynamic changed before save _saveVdsDynamic = true; _saveVdsStatistics = true; @@ -1129,8 +1127,7 @@ tempRunningList.add(runningVm.getVmDynamic()); } for (VmDynamic runningVm : tempRunningList) { - VM vmToUpdate = null; - vmToUpdate = _vmDict.get(runningVm.getId()); + VM vmToUpdate = _vmDict.get(runningVm.getId()); if (vmToUpdate == null || (vmToUpdate.getStatus() != runningVm.getstatus() && !(vmToUpdate.getStatus() == VMStatus.SavingState && runningVm @@ -1165,9 +1162,8 @@ continue; } - VM vmTo = null; // _vdsManager.getVm(vm.getvm_guid()); - vmTo = _vmDict.get(vm.getId()); + VM vmTo = _vmDict.get(vm.getId()); VMStatus status = VMStatus.Unassigned; if (vmTo != null) { status = vmTo.getStatus(); @@ -1204,9 +1200,7 @@ auditVmOnDownEvent(exitStatus, vmDynamic.getExitMessage(), vmStatistics.getId()); - /** - * Vm failed to run - try to rerun it on other Vds - */ + // Vm failed to run - try to rerun it on other Vds if (cacheVm != null) { if (ResourceManager.getInstance().IsVmInAsyncRunningList(vmDynamic.getId())) { log.infoFormat("Running on vds during rerun failed vm: {0}", vmDynamic.getrun_on_vds()); @@ -1228,9 +1222,7 @@ auditVmOnDownEvent(exitStatus, vmDynamic.getExitMessage(), vmStatistics.getId()); } - /** - * Vm moved safely to down status. May be migration - just remove it from Async Running command. - */ + // Vm moved safely to down status. May be migration - just remove it from Async Running command. ResourceManager.getInstance().RemoveAsyncRunningVm(vmDynamic.getId()); } } @@ -1309,8 +1301,7 @@ private void updateRepository(List<VM> running) { for (VmInternalData vmInternalData : _runningVms.values()) { VmDynamic runningVm = vmInternalData.getVmDynamic(); - VM vmToUpdate = null; - vmToUpdate = _vmDict.get(runningVm.getId()); + VM vmToUpdate = _vmDict.get(runningVm.getId()); // launch powerclient on clientIp change logic // if not migrating here and not down @@ -1361,9 +1352,7 @@ AuditLogableBase logable = new AuditLogableBase(_vds.getId(), vmToUpdate.getId()); auditLog(logable, AuditLogType.VM_NOT_RESPONDING); } - /** - * check if vm is suspended and remove it from async list - */ + // check if vm is suspended and remove it from async list else if (runningVm.getstatus() == VMStatus.Paused) { _vmsToRemoveFromAsync.add(vmToUpdate.getId()); if (vmToUpdate.getStatus() != VMStatus.Paused) { @@ -1478,9 +1467,7 @@ private boolean inMigrationTo(VmDynamic runningVm, VM vmToUpdate) { boolean returnValue = false; if (runningVm.getstatus() == VMStatus.MigratingTo) { - /** - * inMigration - */ + // in migration log.infoFormat( "vds::refreshVmList vm id '{0}' is migrating to vds '{1}' ignoring it in the refresh until migration is done", runningVm.getId(), -- To view, visit http://gerrit.ovirt.org/10705 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I21cc745d9034cbf97b1d39ad65a96c30c01e7dd2 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
