Revert "PWX-39445: Option to disable quorum in gossip"

api/client/cluster/client.go

@@ -291,17 +291,15 @@ func (c *clusterClient) Shutdown() error {
 	return nil
 }
 
-func (c *clusterClient) Start(bool, string, string, bool) error {
+func (c *clusterClient) Start(bool, string, string) error {
 	return nil
 }
 
 func (c *clusterClient) Uuid() string {
 	return ""
 }
 
-func (c *clusterClient) StartWithConfiguration(
-	bool, string, []string, string, *cluster.ClusterServerConfiguration, string, bool,
-) error {
+func (c *clusterClient) StartWithConfiguration(bool, string, []string, string, *cluster.ClusterServerConfiguration, string) error {
 	return nil
 }
 

cluster/cluster.go

@@ -368,13 +368,7 @@ type Cluster interface {
 	// nodeInitialized indicates if the caller of this method expects the node
 	// to have been in an already-initialized state.
 	// All managers will default returning NotSupported.
-	Start(
-		nodeInitialized bool,
-		gossipPort string,
-		selfClusterDomain string,
-		// disableQuorum if true will disable the cluster quorum requirement in gossip
-		disableQuorum bool,
-	) error
+	Start(nodeInitialized bool, gossipPort string, selfClusterDomain string) error
 
 	// Like Start, but have the ability to pass in managers to the cluster object
 	StartWithConfiguration(
@@ -384,8 +378,6 @@ type Cluster interface {
 		selfClusterDomain string,
 		config *ClusterServerConfiguration,
 		gobRegisterName string,
-		// disableQuorum if true will disable the cluster quorum requirement in gossip
-		disableQuorum bool,
 	) error
 
 	// Get a unique identifier for this cluster. Depending on the implementation, this could

cluster/cluster_not_supported.go

@@ -112,14 +112,12 @@ func (m *NullClusterManager) Shutdown() error {
 }
 
 // Start
-func (m *NullClusterManager) Start(arg1 bool, arg2 string, arg3 string, arg4 bool) error {
+func (m *NullClusterManager) Start(arg1 bool, arg2 string, arg3 string) error {
 	return ErrNotImplemented
 }
 
 // StartWithConfiguration
-func (m *NullClusterManager) StartWithConfiguration(
-	arg1 bool, arg2 string, arg3 []string, arg4 string, arg5 *ClusterServerConfiguration, arg6 string, arg7 bool,
-) error {
+func (m *NullClusterManager) StartWithConfiguration(arg1 bool, arg2 string, arg3 []string, arg4 string, arg5 *ClusterServerConfiguration, arg6 string) error {
 	return ErrNotImplemented
 }
 

cluster/manager/manager.go

@@ -100,8 +100,6 @@ type ClusterManager struct {
 	selfClusterDomain    string
 	// kvdbWatchIndex stores the kvdb index to start the watch
 	kvdbWatchIndex uint64
-	// disableQuorum if true will disable the cluster quorum requirement in gossip
-	disableQuorum bool
 }
 
 // Init instantiates a new cluster manager.
@@ -848,13 +846,11 @@ func (c *ClusterManager) startHeartBeat(
 		logrus.Infof("Starting Gossip...")
 	}
 
-	quorumProvider := types.QUORUM_PROVIDER_DEFAULT
-	if c.disableQuorum {
-		quorumProvider = types.QUORUM_PROVIDER_NOOP
-	} else if len(activeMap) > 0 {
-		quorumProvider = types.QUORUM_PROVIDER_FAILURE_DOMAINS
+	if len(activeMap) > 0 {
+		gossipConfig.QuorumProviderType = types.QUORUM_PROVIDER_FAILURE_DOMAINS
+	} else {
+		gossipConfig.QuorumProviderType = types.QUORUM_PROVIDER_DEFAULT
 	}
-	gossipConfig.QuorumProviderType = quorumProvider
 
 	c.gossip.Start(gossipConfig)
 	c.gossip.UpdateCluster(c.getNonDecommisionedPeers(*clusterInfo))
@@ -1211,9 +1207,6 @@ func (c *ClusterManager) initializeCluster(db kvdb.Kvdb) (
 }
 
 func (c *ClusterManager) quorumMember() bool {
-	if c.disableQuorum {
-		return false
-	}
 	if c.listeners.Len() == 0 {
 		// If there are no listeners registered by the driver, assume
 		// this node is a quorum member, so this becomes the default behavior
@@ -1449,16 +1442,14 @@ func (c *ClusterManager) Start(
 	nodeInitialized bool,
 	gossipPort string,
 	selfClusterDomain string,
-	disableQuorum bool,
 ) error {
 	return c.StartWithConfiguration(
 		nodeInitialized,
 		gossipPort,
 		[]string{ClusterDBKey},
 		selfClusterDomain,
 		&cluster.ClusterServerConfiguration{},
-		"",
-		disableQuorum)
+		"")
 }
 
 func (c *ClusterManager) StartWithConfiguration(
@@ -1468,7 +1459,6 @@ func (c *ClusterManager) StartWithConfiguration(
 	selfClusterDomain string,
 	config *cluster.ClusterServerConfiguration,
 	gobRegisterName string,
-	disableQuorum bool,
 ) error {
 	var err error
 
@@ -1551,7 +1541,6 @@ func (c *ClusterManager) StartWithConfiguration(
 	)
 	c.gossipVersion = types.GOSSIP_VERSION_2
 
-	c.disableQuorum = disableQuorum
 	var exist bool
 	lastIndex, clusterInfo, err := c.initializeAndStartHeartbeat(
 		kv,

cluster/manager/manager_test.go

@@ -93,7 +93,7 @@ func TestUpdateSchedulerNodeName(t *testing.T) {
 
 	err = inst.StartWithConfiguration(false, "1001", []string{}, "", &cluster.ClusterServerConfiguration{
 		ConfigSystemTokenManager: manager,
-	}, "gobRegisterName/path", false)
+	}, "gobRegisterName/path")
 	assert.NoError(t, err)
 
 	node, err := inst.Inspect(nodeID)

cmd/osd/main.go

@@ -607,7 +607,6 @@ func start(c *cli.Context) error {
 				ConfigSystemTokenManager: auth.SystemTokenManagerInst(),
 			},
 			"",
-			false,
 		); err != nil {
 			return fmt.Errorf("Unable to start cluster manager: %v", err)
 		}