Merge pull request #925 from rqlite/ignore-disco-state

Ignore disco ID if there is preexisting state

CHANGELOG.md

@@ -1,6 +1,7 @@
 ## 6.8.1 (unreleased)
 ### Implementation changes and bug fixes
 - [Fix URL](https://github.com/rqlite/rqlite/commit/d8e915e0be589b5cf1d593b80985e8247ba5f3d9) for `.ready` CLI command.
+- [PR #925](https://github.com/rqlite/rqlite/pull/925): Ignore disco ID if there is preexisting state. Fixes [issue #347](https://github.com/rqlite/rqlite/issues/347).
 
 ## 6.8.0 (November 9th 2021)
 ### New features

cmd/rqlited/main.go

@@ -249,7 +249,7 @@ func main() {
 
 	// Determine join addresses
 	var joins []string
-	joins, err = determineJoinAddresses()
+	joins, err = determineJoinAddresses(isNew)
 	if err != nil {
 		log.Fatalf("unable to determine join addresses: %s", err.Error())
 	}
@@ -350,7 +350,7 @@ func main() {
 	log.Println("rqlite server stopped")
 }
 
-func determineJoinAddresses() ([]string, error) {
+func determineJoinAddresses(isNew bool) ([]string, error) {
 	apiAdv := httpAddr
 	if httpAdv != "" {
 		apiAdv = httpAdv
@@ -363,17 +363,21 @@ func determineJoinAddresses() ([]string, error) {
 	}
 
 	if discoID != "" {
-		log.Printf("registering with Discovery Service at %s with ID %s", discoURL, discoID)
+		if !isNew {
-		c := disco.New(discoURL)
+			log.Printf("node has preexisting state, ignoring Discovery ID %s", discoID)
-		r, err := c.Register(discoID, apiAdv)
+		} else {
-		if err != nil {
+			log.Printf("registering with Discovery Service at %s with ID %s", discoURL, discoID)
-			return nil, err
+			c := disco.New(discoURL)
-		}
+			r, err := c.Register(discoID, apiAdv)
-		log.Println("Discovery Service responded with nodes:", r.Nodes)
+			if err != nil {
-		for _, a := range r.Nodes {
+				return nil, err
-			if a != apiAdv {
+			}
-				// Only other nodes can be joined.
+			log.Println("Discovery Service responded with nodes:", r.Nodes)
-				addrs = append(addrs, a)
+			for _, a := range r.Nodes {
+				if a != apiAdv {
+					// Only other nodes can be joined.
+					addrs = append(addrs, a)
+				}
 			}
 		}
 	}