diff --git a/plugins/mysql/index.py b/plugins/mysql/index.py index 531e6aafd..a4d7a1721 100755 --- a/plugins/mysql/index.py +++ b/plugins/mysql/index.py @@ -2233,7 +2233,7 @@ def initSlaveStatus(version=''): ssh.connect(hostname=ip, port=int(master_port), username='root', pkey=key) - cmd = 'cd /www/server/mdserver-web && python3 plugins/mysql/index.py get_master_rep_slave_user_cmd {"username":"","db":""}' + cmd = 'cd /www/server/mdserver-web && source bin/activate && python3 plugins/mysql/index.py get_master_rep_slave_user_cmd {"username":"","db":""}' stdin, stdout, stderr = ssh.exec_command(cmd) result = stdout.read() result = result.decode('utf-8') @@ -2254,11 +2254,11 @@ def initSlaveStatus(version=''): # 保证同步IP一致 cmd = cmd_data['data']['cmd'] if cmd.find('SOURCE_HOST') > -1: - cmd = re.sub(r"SOURCE_HOST='(.*)'", + cmd = re.sub(r"SOURCE_HOST='(.*?)'", "SOURCE_HOST='" + ip + "'", cmd, 1) if cmd.find('MASTER_HOST') > -1: - cmd = re.sub(r"MASTER_HOST='(.*)'", + cmd = re.sub(r"MASTER_HOST='(.*?)'", "MASTER_HOST='" + ip + "'", cmd, 1) db.query(cmd) db.query("start slave user='{}' password='{}';".format( @@ -2392,7 +2392,7 @@ def doFullSync(version=''): writeDbSyncStatus({'code': 0, 'msg': '登录Master成功...', 'progress': 5}) dbname = args['db'] - cmd = "cd /www/server/mdserver-web && python3 plugins/mysql/index.py dump_mysql_data {\"db\":'" + dbname + "'}" + cmd = "cd /www/server/mdserver-web && source bin/activate && python3 plugins/mysql/index.py dump_mysql_data {\"db\":'" + dbname + "'}" print(cmd) stdin, stdout, stderr = ssh.exec_command(cmd) result = stdout.read() @@ -2415,7 +2415,7 @@ def doFullSync(version=''): if copy_status == None: writeDbSyncStatus({'code': 2, 'msg': '数据同步本地完成...', 'progress': 40}) - cmd = 'cd /www/server/mdserver-web && python3 plugins/mysql/index.py get_master_rep_slave_user_cmd {"username":"' + db_user + '","db":""}' + cmd = 'cd /www/server/mdserver-web && source bin/activate && python3 plugins/mysql/index.py get_master_rep_slave_user_cmd {"username":"' + db_user + '","db":""}' stdin, stdout, stderr = ssh.exec_command(cmd) result = stdout.read() result = result.decode('utf-8') @@ -2427,10 +2427,12 @@ def doFullSync(version=''): cmd = cmd_data['data']['cmd'] # 保证同步IP一致 if cmd.find('SOURCE_HOST') > -1: - cmd = re.sub(r"SOURCE_HOST='(.*)'", "SOURCE_HOST='" + ip + "'", cmd, 1) + cmd = re.sub(r"SOURCE_HOST='(.*?)'", + "SOURCE_HOST='" + ip + "'", cmd, 1) if cmd.find('MASTER_HOST') > -1: - cmd = re.sub(r"MASTER_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']