Arik Hadas has uploaded a new change for review. Change subject: core: change the signature of handleVdsMaintenanceTimeout ......................................................................
core: change the signature of handleVdsMaintenanceTimeout VdsEventListener#handleVdsMaintenanceTimeout can get just the ID of the host and not the whole VDS object. Change-Id: Iaa4a4815a1bf69ccae33bb37773a2a1a3b99a02e Signed-off-by: Arik Hadas <aha...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/IVdsEventListener.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java 3 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/12/31612/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java index 197c557..ff380d1 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java @@ -449,10 +449,10 @@ } @Override - public void handleVdsMaintenanceTimeout(final VDS vds) { + public void handleVdsMaintenanceTimeout(Guid vdsId) { // try to put the host to Maintenance again. Backend.getInstance().runInternalAction(VdcActionType.MaintenanceNumberOfVdss, - new MaintenanceNumberOfVdssParameters(Arrays.asList(vds.getId()), true)); + new MaintenanceNumberOfVdssParameters(Arrays.asList(vdsId), true)); } @Override diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/IVdsEventListener.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/IVdsEventListener.java index 30237f9..e22a1e3 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/IVdsEventListener.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/IVdsEventListener.java @@ -59,7 +59,7 @@ void addExternallyManagedVms(List<VmStatic> externalVmList); - void handleVdsMaintenanceTimeout(VDS vds); + void handleVdsMaintenanceTimeout(Guid vdsId); /** * update host's scheduling related properties 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 08b0fbf..33d2774 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 @@ -601,7 +601,7 @@ } private void handleVdsMaintenanceTimeout() { - getVdsEventListener().handleVdsMaintenanceTimeout(_vds); + getVdsEventListener().handleVdsMaintenanceTimeout(_vds.getId()); _vdsManager.calculateNextMaintenanceAttemptTime(); } -- To view, visit http://gerrit.ovirt.org/31612 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaa4a4815a1bf69ccae33bb37773a2a1a3b99a02e Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Arik Hadas <aha...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches