From 94a948b37672fed6a44a0974c4341326918df1fa Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Sat, 6 Aug 2022 15:03:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5IP=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/mysql/conf/my8.0.cnf |  2 +-
 plugins/mysql/index.py       | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/plugins/mysql/conf/my8.0.cnf b/plugins/mysql/conf/my8.0.cnf
index 79b4a8b4b..4dbaaab0a 100644
--- a/plugins/mysql/conf/my8.0.cnf
+++ b/plugins/mysql/conf/my8.0.cnf
@@ -68,7 +68,7 @@ binlog-ignore-db = performance_schema
 
 #slave
 log_replica_updates = 1
-skip-slave-start = 1
+skip_replica_start = 1
 #replicate-do-db
 replicate-ignore-db = information_schema
 replicate-ignore-db = performance_schema
diff --git a/plugins/mysql/index.py b/plugins/mysql/index.py
index 03fea7a1e..d3be5e89f 100755
--- a/plugins/mysql/index.py
+++ b/plugins/mysql/index.py
@@ -2071,6 +2071,8 @@ def setSlaveStatus(version=''):
         ip = dlist[0]['Master_Host']
         conn = pSqliteDb('slave_id_rsa')
         data = conn.field('ip,ps').where("ip=?", (ip,)).find()
+        if len(data) == 0:
+            return mw.returnJson(False, '没有数据无法重启!')
         u = data['ps'].split("|")
         db.query("start slave user='{}' password='{}';".format(u[0], u[1]))
 
@@ -2208,8 +2210,12 @@ def doFullSync(version=''):
     db.query('stop slave')
     writeDbSyncStatus({'code': 3, 'msg': '停止从库完成...', 'progress': 45})
 
-    print(cmd_data)
-    db.query(cmd_data['data']['cmd'])
+    cmd = cmd_data['data']['cmd']
+    # 保证同步IP一致
+    cmd = re.sub(r"SOURCE_HOST='(.*)'", "SOURCE_HOST='" + ip + "'", cmd, 1)
+    cmd = re.sub(r"MASTER_HOST='(.*)'", "SOURCE_HOST='" + ip + "'", cmd, 1)
+
+    db.query(cmd)
     uinfo = cmd_data['data']['info']
     ps = uinfo['username'] + "|" + uinfo['password']
     id_rsa_conn.where('ip=?', (ip,)).setField('ps', ps)