fix external repl switchover, add mysql-db ignore in external repl

yandex · Aug 8, 2023 · 6077291 · 6077291
1 parent 96e311d
commit 6077291
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/internal/app/app.go b/internal/app/app.go
@@ -1604,6 +1604,14 @@ func (app *App) repairSlaveNode(node *mysql.Node, clusterState map[string]*NodeS
 		if err != nil {
 			app.logger.Errorf("repair: %s", err)
 		}
+		err = node.StopExternalReplication()
+		if err != nil {
+			app.logger.Errorf("repair: %s", err)
+		}
+		err = node.ResetExternalReplicationAll()
+		if err != nil {
+			app.logger.Errorf("repair: %s", err)
+		}
 		app.logger.Infof("repair: turning stale master %s to new master %s", host, master)
 		err = app.performChangeMaster(host, master)
 		if err != nil {

diff --git a/internal/mysql/node.go b/internal/mysql/node.go
@@ -999,8 +999,8 @@ func (n *Node) SetExternalReplication() error {
 		return err
 	}
 	err = n.execMogrify(queryIgnoreDB, map[string]interface{}{
-		"ignoreList":	   schemaname("mysql"),
-		"channel":         "external",
+		"ignoreList": schemaname("mysql"),
+		"channel":    "external",
 	})
 	return n.StartExternalReplication()
 }