Oved Ourfali has uploaded a new change for review. Change subject: core: revert xmlrpc fallback ......................................................................
core: revert xmlrpc fallback Previous commit (Change-Id: Ie6f48bec60b520c089f326f8c5e79aec288ff3d6) introduced a fallback mechanism to support getting the proper non-operational reason when adding old hosts to 3.5 cluster. I encountered some issues with the fix, so reverting the Install logic until further examination. Change-Id: Ib45a6e828e459f982c0c77ca778f2b83e97a881b Signed-off-by: Oved Ourfali <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsInternalCommand.java 1 file changed, 0 insertions(+), 20 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/17/34117/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsInternalCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsInternalCommand.java index eeb07be..7b4a58e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsInternalCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsInternalCommand.java @@ -6,7 +6,6 @@ import org.apache.commons.lang.StringUtils; import org.ovirt.engine.core.bll.context.CommandContext; import org.ovirt.engine.core.bll.network.NetworkConfigurator; -import org.ovirt.engine.core.bll.transport.ProtocolDetector; import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.FeatureSupported; import org.ovirt.engine.core.common.action.InstallVdsParameters; @@ -15,9 +14,7 @@ import org.ovirt.engine.core.common.businessentities.OpenstackNetworkProviderProperties; import org.ovirt.engine.core.common.businessentities.Provider; import org.ovirt.engine.core.common.businessentities.ProviderType; -import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.VDSStatus; -import org.ovirt.engine.core.common.businessentities.VdsProtocol; import org.ovirt.engine.core.common.errors.VdcBllMessages; import org.ovirt.engine.core.common.locks.LockingGroup; import org.ovirt.engine.core.common.utils.Pair; @@ -163,19 +160,6 @@ RunSleepOnReboot(getStatusOnReboot()); break; case Complete: - if (checkProtocolTofallback(getVds())) { - // we need to check whether we are connecting to vdsm which supports xmlrpc only - ProtocolDetector detector = new ProtocolDetector(getVds()); - if (!detector.attemptConnection()) { - detector.stopConnection(); - if (detector.attemptFallbackProtocol()) { - detector.setFallbackProtocol(); - } else { - detector.stopConnection(); - throw new VdsInstallException(VDSStatus.InstallFailed, "Host not reachable"); - } - } - } if (!configureNetworkUsingHostDeploy) { configureManagementNetwork(); } @@ -198,10 +182,6 @@ } catch (Exception e) { handleError(e, VDSStatus.InstallFailed); } - } - - private boolean checkProtocolTofallback(VDS vds) { - return VdsProtocol.STOMP.equals(vds.getProtocol()); } private void configureManagementNetwork() { -- To view, visit http://gerrit.ovirt.org/34117 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib45a6e828e459f982c0c77ca778f2b83e97a881b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Oved Ourfali <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
