Alissa Bonas has uploaded a new change for review. Change subject: core: rename methods in VdsManager ......................................................................
core: rename methods in VdsManager Rename to lowercase to solve findbugs warnings, and all usages accordingly. Change-Id: Ib7e36fab1e64786e323bf33bb82eff99b660f582 Signed-off-by: Alissa Bonas <[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/SetVdsStatusVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/UpdateVdsVMsClearedVDSCommand.java 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 5 files changed, 13 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/66/21366/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 a2e4291..a87a74d 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 @@ -105,7 +105,7 @@ getEventListener().removeAsyncRunningCommand(vmId); } - public void SuccededToRunVm(Guid vmId, Guid vdsId) { + public void succededToRunVm(Guid vmId, Guid vdsId) { if (_asyncRunningVms.containsKey(vmId)) { getEventListener().runningSucceded(vmId); } @@ -172,7 +172,7 @@ // set pending to 0 vds.setPendingVcpusCount(0); - vdsManager.UpdateDynamicData(vds.getDynamicData()); + vdsManager.updateDynamicData(vds.getDynamicData()); } vdsManager.schedulJobs(); _vdsManagersDict.put(vds.getId(), vdsManager); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/SetVdsStatusVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/SetVdsStatusVDSCommand.java index 6e5caaa..dbd6d9b 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/SetVdsStatusVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/SetVdsStatusVDSCommand.java @@ -29,7 +29,7 @@ @Override public Void runInTransaction() { _vdsManager.setStatus(parameters.getStatus(), vds); - _vdsManager.UpdateDynamicData(vds.getDynamicData()); + _vdsManager.updateDynamicData(vds.getDynamicData()); _vdsManager.updateStatisticsData(vds.getStatisticsData()); return null; } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/UpdateVdsVMsClearedVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/UpdateVdsVMsClearedVDSCommand.java index 05b31cf..61f8119 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/UpdateVdsVMsClearedVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/UpdateVdsVMsClearedVDSCommand.java @@ -15,7 +15,7 @@ getVds().setVmsCoresCount(0); getVds().setVmActive(0); getVds().setVmMigrating(0); - _vdsManager.UpdateDynamicData(getVds().getDynamicData()); + _vdsManager.updateDynamicData(getVds().getDynamicData()); } else { getVDSReturnValue().setSucceeded(false); } 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 db985b1..097397a 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 @@ -153,7 +153,7 @@ && !EngineEncryptionUtils.haveKey()) { if (_vds.getStatus() != VDSStatus.Maintenance && _vds.getStatus() != VDSStatus.InstallFailed) { setStatus(VDSStatus.NonResponsive, _vds); - UpdateDynamicData(_vds.getDynamicData()); + updateDynamicData(_vds.getDynamicData()); } log.error("Could not find VDC Certificate file."); AuditLogableBase logable = new AuditLogableBase(_vdsId); @@ -369,7 +369,7 @@ * * @param dynamicData */ - public void UpdateDynamicData(VdsDynamic dynamicData) { + public void updateDynamicData(VdsDynamic dynamicData) { DbFacade.getInstance().getVdsDynamicDao().update(dynamicData); } @@ -409,7 +409,7 @@ } } finally { if (vds != null) { - UpdateDynamicData(vds.getDynamicData()); + updateDynamicData(vds.getDynamicData()); // Update VDS after testing special hardware capabilities monitoringStrategy.processHardwareCapabilities(vds); @@ -523,10 +523,10 @@ /** */ - public void SuccededToRunVm(Guid vmId) { + public void succededToRunVm(Guid vmId) { mUnrespondedAttempts.set(0); sshSoftFencingExecuted.set(false); - ResourceManager.getInstance().SuccededToRunVm(vmId, _vds.getId()); + ResourceManager.getInstance().succededToRunVm(vmId, _vds.getId()); } public VDSStatus refreshCapabilities(AtomicBoolean processHardwareCapsNeeded, VDS vds) { @@ -592,7 +592,7 @@ if (vdsBrokerCommand.getVDSReturnValue().getExceptionObject() instanceof VDSNetworkException && handleNetworkException((VDSNetworkException) vdsBrokerCommand.getVDSReturnValue() .getExceptionObject(), vds)) { - UpdateDynamicData(vds.getDynamicData()); + updateDynamicData(vds.getDynamicData()); updateStatisticsData(vds.getStatisticsData()); } throw vdsBrokerCommand.getVDSReturnValue().getExceptionObject(); @@ -741,7 +741,7 @@ mUnrespondedAttempts.set(0); // change VDS state to connecting setStatus(VDSStatus.Connecting, vds); - UpdateDynamicData(vds.getDynamicData()); + updateDynamicData(vds.getDynamicData()); } public void calculateNextMaintenanceAttemptTime() { 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 e886bcd..6877b0d 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 @@ -128,7 +128,7 @@ private void saveDataToDb() { if (_saveVdsDynamic) { - _vdsManager.UpdateDynamicData(_vds.getDynamicData()); + _vdsManager.updateDynamicData(_vds.getDynamicData()); } if (_saveVdsStatistics) { @@ -423,7 +423,7 @@ } for (Guid vm_guid : _succededToRunVms) { - _vdsManager.SuccededToRunVm(vm_guid); + _vdsManager.succededToRunVm(vm_guid); } // run all vms that crushed that marked with auto startup for (Guid vm_guid : _autoVmsToRun) { -- To view, visit http://gerrit.ovirt.org/21366 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib7e36fab1e64786e323bf33bb82eff99b660f582 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alissa Bonas <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
