Moti Asayag has uploaded a new change for review. Change subject: engine: Avoid static methods in VdsManager ......................................................................
engine: Avoid static methods in VdsManager static methods can be spared from VdsManager. Change-Id: If67c4fafcd8fcbb9f12c5f39c84d50d653970d6d Signed-off-by: Moti Asayag <masa...@redhat.com> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/HostMonitoring.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/36/40936/1 diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/HostMonitoring.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/HostMonitoring.java index 4b11b5c..a150ea1 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/HostMonitoring.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/HostMonitoring.java @@ -77,7 +77,7 @@ if (firstStatus != vds.getStatus() && vds.getStatus() == VDSStatus.Up) { // use this lock in order to allow only one host updating DB and // calling UpEvent in a time - VdsManager.cancelRecoveryJob(vds.getId()); + vdsManager.cancelRecoveryJob(); log.debug("vds '{}' ({}) firing up event.", vds.getName(), vds.getId()); vdsManager.setIsSetNonOperationalExecuted(!getVdsEventListener().vdsUpEvent(vds)); } 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 3aa587b..75c1940 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 @@ -204,7 +204,7 @@ } if (isMonitoringNeeded()) { setStartTime(); - hostMonitoring = new HostMonitoring(VdsManager.this, cachedVds, monitoringStrategy); + hostMonitoring = new HostMonitoring(this, cachedVds, monitoringStrategy); hostMonitoring.refresh(); mUnrespondedAttempts.set(0); setLastUpdate(); @@ -333,7 +333,7 @@ log.error("Exception", ex); } - private static void logException(final RuntimeException ex) { + private void logException(final RuntimeException ex) { log.error("ResourceManager::refreshVdsRunTimeInfo", ex); } @@ -937,7 +937,7 @@ return vdsId; } - public static void cancelRecoveryJob(Guid vdsId) { + public void cancelRecoveryJob() { String jobId = recoveringJobIdMap.remove(vdsId); if (jobId != null) { log.info("Cancelling the recovery from crash timer for VDS '{}' because vds started initializing", vdsId); -- To view, visit https://gerrit.ovirt.org/40936 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If67c4fafcd8fcbb9f12c5f39c84d50d653970d6d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Moti Asayag <masa...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches