Eli Mesika has uploaded a new change for review. Change subject: core:There is no notification on event tab... ......................................................................
core:There is no notification on event tab... There is no notification on event tab about what proxy is selected to fence a host This patch is a pre step for the BZ fix that basically renames the confusing FindVdsToFence method to findProxyHost Change-Id: Ie6720715b1fd2a80f343796e3fdc47c40739d332 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=920112 Signed-off-by: Eli Mesika <emes...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceExecutor.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetNewVdsFenceStatusQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsFenceStatusQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java 5 files changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/74/13174/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceExecutor.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceExecutor.java index 08354c8..8638464 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceExecutor.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceExecutor.java @@ -46,7 +46,7 @@ _action = actionType; } - public boolean FindVdsToFence() { + public boolean findProxyHost() { PMProxyOptions proxyOption=null; final Guid NO_VDS = Guid.Empty; int count = 0; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java index 9629e5a..cf8b2d5 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java @@ -120,7 +120,7 @@ if (secondsLeftToNextPmOp <= 0) { // try to get vds status executor = createExecutorForProxyCheck(); - if (executor.FindVdsToFence()) { + if (executor.findProxyHost()) { if (!(retValue = executor.checkProxyHostConnectionToHost())) { addCanDoActionMessage(VdcBllMessages.VDS_FAILED_FENCE_VIA_PROXY_CONNECTION); } @@ -185,7 +185,7 @@ */ private void handleSingleAgent(VDSStatus lastStatus, VDSReturnValue vdsReturnValue) { executor = new FenceExecutor(getVds(), getParameters().getAction()); - if (executor.FindVdsToFence()) { + if (executor.findProxyHost()) { vdsReturnValue = executor.Fence(); setFenceSucceeded(vdsReturnValue.getSucceeded()); if (getFenceSucceeded()) { @@ -208,7 +208,7 @@ */ private void handleMultipleSequentialAgents(VDSStatus lastStatus, VDSReturnValue vdsReturnValue) { executor = new FenceExecutor(getVds(), getParameters().getAction()); - if (executor.FindVdsToFence()) { + if (executor.findProxyHost()) { vdsReturnValue = executor.Fence(FenceAgentOrder.Primary); setFenceSucceeded(vdsReturnValue.getSucceeded()); if (getFenceSucceeded()) { @@ -495,7 +495,7 @@ ThreadUtils.sleep(SLEEP_BEFORE_FIRST_ATTEMPT); while (!statusReached && i <= getRerties()) { log.infoFormat("Attempt {0} to get vds {1} status", i, vdsName); - if (executor.FindVdsToFence()) { + if (executor.findProxyHost()) { VDSReturnValue returnValue = executor.Fence(order); if (returnValue != null && returnValue.getReturnValue() != null) { FenceStatusReturnValue value = (FenceStatusReturnValue) returnValue.getReturnValue(); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetNewVdsFenceStatusQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetNewVdsFenceStatusQuery.java index 96139be..937d72f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetNewVdsFenceStatusQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetNewVdsFenceStatusQuery.java @@ -39,7 +39,7 @@ } VDS vds = tempVar; FenceExecutor executor = new FenceExecutor(vds, FenceActionType.Status); - if (executor.FindVdsToFence()) { + if (executor.findProxyHost()) { VDSReturnValue returnValue = executor.Fence(getParameters().getOrder()); if (returnValue.getReturnValue() != null) { getQueryReturnValue().setReturnValue(returnValue.getReturnValue()); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsFenceStatusQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsFenceStatusQuery.java index 8ca310e..8f0c959 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsFenceStatusQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsFenceStatusQuery.java @@ -25,7 +25,7 @@ setVdsName(vds.getName()); FenceExecutor executor = new FenceExecutor(vds, FenceActionType.Status); VDSReturnValue returnValue = null; - if (executor.FindVdsToFence()) { + if (executor.findProxyHost()) { returnValue = executor.Fence(FenceAgentOrder.Primary); if (returnValue.getReturnValue() != null) { if (returnValue.getSucceeded()) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java index 72a73f3..f1f2172 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java @@ -98,7 +98,7 @@ FenceExecutor executor = new FenceExecutor(getVds(), FenceActionType.Status); // check first if we have any VDS to act as the proxy for fence // actions. - if (getVds().getpm_enabled() && executor.FindVdsToFence()) { + if (getVds().getpm_enabled() && executor.findProxyHost()) { VDSReturnValue returnValue = executor.Fence(); _fenceSucceeded = returnValue.getSucceeded(); _fenceStatusReturnValue = (FenceStatusReturnValue) returnValue.getReturnValue(); -- To view, visit http://gerrit.ovirt.org/13174 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie6720715b1fd2a80f343796e3fdc47c40739d332 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Eli Mesika <emes...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
