Eli Mesika has uploaded a new change for review. Change subject: core: improving FenceExecuter code readability ......................................................................
core: improving FenceExecuter code readability Change-Id: I4c248888b94e51eb90c58dd1803715b9a328ea7e Signed-off-by: root <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceExecutor.java 1 file changed, 18 insertions(+), 22 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/49/32249/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 baefdf4..5e27cc3 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 @@ -339,75 +339,71 @@ return false; } if (proxyOptions == PMProxyOptions.CLUSTER) { + if (! vds.getVdsGroupId().equals(_vds.getVdsGroupId())) { + return false; + } if (onlyUpHost) { if (filterSelf) { return !vds.getId().equals(_vds.getId()) - && vds.getVdsGroupId().equals(_vds.getVdsGroupId()) && vds.getStatus() == VDSStatus.Up; } else { - return vds.getStatus() == VDSStatus.Up - && vds.getVdsGroupId().equals(_vds.getVdsGroupId()); + return vds.getStatus() == VDSStatus.Up; } } else { if (filterSelf) { return !isHostNetworkUnreacable(vds) && - !vds.getId().equals(_vds.getId()) - && vds.getVdsGroupId().equals(_vds.getVdsGroupId()); + !vds.getId().equals(_vds.getId()); } else { - return !isHostNetworkUnreacable(vds) - && vds.getVdsGroupId().equals(_vds.getVdsGroupId()); - + return !isHostNetworkUnreacable(vds); } } } else if (proxyOptions == PMProxyOptions.DC) { + if(! vds.getStoragePoolId().equals(_vds.getStoragePoolId())) { + return false; + } if (onlyUpHost) { if (filterSelf) { return !vds.getId().equals(_vds.getId()) - && vds.getStoragePoolId().equals(_vds.getStoragePoolId()) && vds.getStatus() == VDSStatus.Up; } else { - return vds.getStatus() == VDSStatus.Up - && vds.getStoragePoolId().equals(_vds.getStoragePoolId()); + return vds.getStatus() == VDSStatus.Up; } } else { if (filterSelf) { return !isHostNetworkUnreacable(vds) - && !vds.getId().equals(_vds.getId()) - && vds.getStoragePoolId().equals(_vds.getStoragePoolId()); + && !vds.getId().equals(_vds.getId()); } else { - return !isHostNetworkUnreacable(vds) - && vds.getStoragePoolId().equals(_vds.getStoragePoolId()); + return !isHostNetworkUnreacable(vds); } } } else if (proxyOptions == PMProxyOptions.OTHER_DC) { + if (vds.getStoragePoolId().equals(_vds.getStoragePoolId())) { + return false; + } if (onlyUpHost) { if (filterSelf) { return !vds.getId().equals(_vds.getId()) - && !vds.getStoragePoolId().equals(_vds.getStoragePoolId()) && vds.getStatus() == VDSStatus.Up; } else { - return vds.getStatus() == VDSStatus.Up - && !vds.getStoragePoolId().equals(_vds.getStoragePoolId()); + return vds.getStatus() == VDSStatus.Up; } } else { if (filterSelf) { return !isHostNetworkUnreacable(vds) - && !vds.getId().equals(_vds.getId()) - && !vds.getStoragePoolId().equals(_vds.getStoragePoolId()); + && !vds.getId().equals(_vds.getId()); } else { - return !isHostNetworkUnreacable(vds) - && !vds.getStoragePoolId().equals(_vds.getStoragePoolId()); + return !isHostNetworkUnreacable(vds); } } } -- To view, visit http://gerrit.ovirt.org/32249 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4c248888b94e51eb90c58dd1803715b9a328ea7e Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Eli Mesika <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
