Merge branch 'master' into credential-ownership

libopenstorage · Mar 14, 2019 · edb4d0c · edb4d0c
2 parents 8fb59b8 + 261030e
commit edb4d0c
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/cluster/manager/manager.go b/cluster/manager/manager.go
@@ -970,8 +970,6 @@ func (c *ClusterManager) waitForQuorum(exist bool) error {
 				}
 				return err
 			}
-			c.status = api.Status_STATUS_OK
-			c.selfNode.Status = api.Status_STATUS_OK
 			break
 		} else {
 			c.status = api.Status_STATUS_NOT_IN_QUORUM
@@ -1000,6 +998,10 @@ func (c *ClusterManager) waitForQuorum(exist bool) error {
 		}
 	}
 
+	// Update the status after the listeners are started to ensure all REST points are available.
+	c.status = api.Status_STATUS_OK
+	c.selfNode.Status = api.Status_STATUS_OK
+
 	return nil
 }