From d241ceea3e5bf5f7178560f350191ccae91e7569 Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Thu, 16 May 2024 18:55:07 +0800 Subject: [PATCH] Update index.py --- plugins/mysql/index.py | 52 +++++++++++++++++--------------------------------- 1 file changed, 18 insertions(+), 34 deletions(-) diff --git a/plugins/mysql/index.py b/plugins/mysql/index.py index 0377db9ce..1d4d5a8e1 100755 --- a/plugins/mysql/index.py +++ b/plugins/mysql/index.py @@ -2395,44 +2395,28 @@ def getMasterRepSlaveUserCmd(version): channel_name = " for channel 'r{}';".format(sid) mdb8 = ['8.0','8.1','8.2','8.3','8.4'] - if mode == "gtid": - sql = "CHANGE MASTER TO MASTER_HOST='" + ip + "', MASTER_PORT=" + port + ", MASTER_USER='" + \ - clist[0]['username'] + "', MASTER_PASSWORD='" + \ - clist[0]['password'] + "'" - + sql = '' + if not mw.inArray(mdb8,version): + base_sql = "CHANGE MASTER TO MASTER_HOST='" + ip + "', MASTER_PORT=" + port + ", MASTER_USER='" + \ + clist[0]['username'] + "', MASTER_PASSWORD='" + \ + clist[0]['password'] + "'" + + sql += base_sql +';' + sql += "
" + sql += base_sql + ", MASTER_AUTO_POSITION=1" + channel_name sql += "
" - sql += "CHANGE MASTER TO MASTER_HOST='" + ip + "', MASTER_PORT=" + port + ", MASTER_USER='" + \ - clist[0]['username'] + "', MASTER_PASSWORD='" + \ - clist[0]['password'] + "', MASTER_AUTO_POSITION=1" + channel_name - - sql += "
" - - sql += "CHANGE MASTER TO MASTER_HOST='" + ip + "', MASTER_PORT=" + port + ", MASTER_USER='" + \ - clist[0]['username'] + "', MASTER_PASSWORD='" + \ - clist[0]['password'] + \ - "', MASTER_LOG_FILE='" + mstatus[0]["File"] + \ - "',MASTER_LOG_POS=0" + channel_name - - if mw.inArray(mdb8,version): - sql = "CHANGE REPLICATION SOURCE TO SOURCE_HOST='" + ip + "', SOURCE_PORT=" + port + ", SOURCE_USER='" + \ - clist[0]['username'] + "', SOURCE_PASSWORD='" + \ - clist[0]['password'] + \ - "', MASTER_AUTO_POSITION=1" + channel_name + sql += base_sql + "', MASTER_LOG_FILE='" + mstatus[0]["File"] + "',MASTER_LOG_POS=" + str(mstatus[0]["Position"]) + channel_name else: - sql = "CHANGE MASTER TO MASTER_HOST='" + ip + "', MASTER_PORT=" + port + ", MASTER_USER='" + \ - clist[0]['username'] + "', MASTER_PASSWORD='" + \ - clist[0]['password'] + \ - "', MASTER_LOG_FILE='" + mstatus[0]["File"] + \ - "',MASTER_LOG_POS=" + str(mstatus[0]["Position"]) + channel_name - - if mw.inArray(mdb8,version): - sql = "CHANGE REPLICATION SOURCE TO SOURCE_HOST='" + ip + "', SOURCE_PORT=" + port + ", SOURCE_USER='" + \ + base_sql = "CHANGE REPLICATION SOURCE TO SOURCE_HOST='" + ip + "', SOURCE_PORT=" + port + ", SOURCE_USER='" + \ clist[0]['username'] + "', SOURCE_PASSWORD='" + \ - clist[0]['password'] + \ - "', SOURCE_LOG_FILE='" + mstatus[0]["File"] + \ - "',SOURCE_LOG_POS=" + \ - str(mstatus[0]["Position"]) + channel_name + clist[0]['password']+"'" + sql += base_sql +';' + sql += "
" + sql += base_sql + ", MASTER_AUTO_POSITION=1" + channel_name + sql += "
" + sql += base_sql + "', SOURCE_LOG_FILE='" + mstatus[0]["File"] + "',SOURCE_LOG_POS=" + str(mstatus[0]["Position"]) + channel_name + data = {} data['cmd'] = sql