Kanagaraj M has uploaded a new change for review. Change subject: engine: making gluster peer probe optional while adding Host ......................................................................
engine: making gluster peer probe optional while adding Host A new boolean field is added to AddVdsActionParameters to specify the gluster peer probe is needed or not. Whenever a new host is added to a gluster cluster, peer probe will done from any existing online host in the cluster. This will make the new host part of the gluster cluster. But when importing an existing gluster cluster hosts peer probe will not be needed. This will be used by import gluster cluster feature. Change-Id: Iff6a0e072f686237a4440010acb9701ba0bce87e Signed-off-by: Kanagaraj M <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVdsActionParameters.java 2 files changed, 14 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/91/7391/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java index 787b95e..9ab6128 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java @@ -164,7 +164,9 @@ } else { // If cluster supports gluster service do gluster peer probe // only on non vds installation mode. - if (getVdsGroup().supportsGlusterService() && getAllVds(getVdsGroupId()).size() > 1) { + // Also gluster peer probe is not needed when importing an existing gluster cluster + if (getVdsGroup().supportsGlusterService() + && getParameters().isGlusterPeerProbeNeeded() && getAllVds(getVdsGroupId()).size() > 1) { String hostName = (getParameters().getvds().gethost_name().isEmpty()) ? getParameters().getvds().getManagmentIp() : getParameters().getvds().gethost_name(); @@ -319,7 +321,7 @@ } } } - if (getVdsGroup().supportsGlusterService()) { + if (getVdsGroup().supportsGlusterService() && getParameters().isGlusterPeerProbeNeeded()) { if (clusterHasServers()) { upServer = ClusterUtils.getInstance().getUpServer(getVdsGroupId()); if (upServer == null) { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVdsActionParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVdsActionParameters.java index 3d53430..f755fd6 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVdsActionParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVdsActionParameters.java @@ -14,6 +14,8 @@ private boolean privateAddPending; + private boolean isGlusterPeerProbeNeeded = true; + public boolean getAddPending() { return privateAddPending; } @@ -32,4 +34,12 @@ public Guid getVdsForUniqueId() { return vdsId; } + + public void setIsGlusterPeerProbeNeeded(boolean isGlusterPeerProbeNeeded) { + this.isGlusterPeerProbeNeeded = isGlusterPeerProbeNeeded; + } + + public boolean isGlusterPeerProbeNeeded() { + return this.isGlusterPeerProbeNeeded; + } } -- To view, visit http://gerrit.ovirt.org/7391 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iff6a0e072f686237a4440010acb9701ba0bce87e Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Kanagaraj M <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
