K8SPS-365: Fix crashes after MySQL version upgrade (#708)

Co-authored-by: Viacheslav Sarzhan <slava.sarzhan@percona.com>

Author: egegunes

cmd/bootstrap/async_replication.go

@@ -37,16 +37,6 @@ func bootstrapAsyncReplication(ctx context.Context) error {
 	}
 	log.Printf("Peers: %v", sets.List(peers))
 
-	exists, err := lockExists()
-	if err != nil {
-		return errors.Wrap(err, "lock file check")
-	}
-	if exists {
-		log.Printf("Waiting for bootstrap.lock to be deleted")
-		if err = waitLockRemoval(); err != nil {
-			return errors.Wrap(err, "wait lock removal")
-		}
-	}
 	primary, replicas, err := getTopology(ctx, peers)
 	if err != nil {
 		return errors.Wrap(err, "select donor")

cmd/bootstrap/group_replication.go

@@ -309,17 +309,6 @@ func bootstrapGroupReplication(ctx context.Context) error {
 		log.Printf("bootstrap finished in %f seconds", timer.ElapsedSeconds("total"))
 	}()
 
-	exists, err := lockExists()
-	if err != nil {
-		return errors.Wrap(err, "lock file check")
-	}
-	if exists {
-		log.Printf("Waiting for bootstrap.lock to be deleted")
-		if err = waitLockRemoval(); err != nil {
-			return errors.Wrap(err, "wait lock removal")
-		}
-	}
-
 	log.Println("Bootstrap starting...")
 
 	localShell, err := connectToLocal(ctx)
@@ -393,8 +382,6 @@ func bootstrapGroupReplication(ctx context.Context) error {
 		}
 
 		log.Printf("Added instance (%s) to InnoDB cluster", localShell.host)
-
-		os.Exit(1)
 	}
 
 	rescanNeeded := false

cmd/bootstrap/main.go

@@ -34,6 +34,17 @@ func main() {
 		os.Exit(0)
 	}
 
+	exists, err := lockExists("bootstrap")
+	if err != nil {
+		log.Fatalf("failed to check bootstrap.lock: %s", err)
+	}
+	if exists {
+		log.Printf("Waiting for bootstrap.lock to be deleted")
+		if err = waitLockRemoval("bootstrap"); err != nil {
+			log.Fatalf("failed to wait for bootstrap.lock: %s", err)
+		}
+	}
+
 	clusterType := os.Getenv("CLUSTER_TYPE")
 	switch clusterType {
 	case "group-replication":

cmd/bootstrap/utils.go

@@ -68,8 +68,8 @@ func lookup(svcName string) (sets.Set[string], error) {
 	return endpoints, nil
 }
 
-func lockExists() (bool, error) {
-	return fileExists("/var/lib/mysql/bootstrap.lock")
+func lockExists(lockName string) (bool, error) {
+	return fileExists(fmt.Sprintf("/var/lib/mysql/%s.lock", lockName))
 }
 
 func fileExists(name string) (bool, error) {
@@ -83,9 +83,9 @@ func fileExists(name string) (bool, error) {
 	return true, nil
 }
 
-func waitLockRemoval() error {
+func waitLockRemoval(lockName string) error {
 	for {
-		exists, err := lockExists()
+		exists, err := lockExists(lockName)
 		if err != nil {
 			return err
 		}