diff --git a/plugins/mariadb/index.py b/plugins/mariadb/index.py index 4706fbcb8..ed76182ee 100755 --- a/plugins/mariadb/index.py +++ b/plugins/mariadb/index.py @@ -48,7 +48,6 @@ def getInitDFile(): def getArgs(): args = sys.argv[2:] - tmp = {} args_len = len(args) diff --git a/plugins/mariadb/js/mariadb.js b/plugins/mariadb/js/mariadb.js index 134ace3b6..31e89c126 100755 --- a/plugins/mariadb/js/mariadb.js +++ b/plugins/mariadb/js/mariadb.js @@ -1669,7 +1669,7 @@ function deleteSlave(sign = ''){ var rdata = $.parseJSON(data.data); showMsg(rdata['msg'], function(){ masterOrSlaveConf(); - },{},3000); + },{icon:rdata.status?1:2,time:3000},3000); }); } @@ -1701,7 +1701,7 @@ function getFullSyncStatus(db){

"; } - var loadOpen = layer.open({ + layer.open({ type: 1, title: '全量同步['+db+']', area: '500px', @@ -2310,7 +2310,6 @@ function masterOrSlaveConf(version=''){ $('.db_error').click(function(){ var id = $(this).data('id'); var info = rdata.data[id]; - console.log(info); var err_line = ""; err_line +="\ diff --git a/plugins/mysql/conf/my5.7.cnf b/plugins/mysql/conf/my5.7.cnf index 68c8cdb27..861b42d65 100644 --- a/plugins/mysql/conf/my5.7.cnf +++ b/plugins/mysql/conf/my5.7.cnf @@ -80,6 +80,8 @@ replicate-ignore-db = performance_schema replicate-ignore-db = mysql replicate-ignore-db = test +master_info_repository = table +relay_log_info_repository = table innodb_data_home_dir = {$SERVER_APP_PATH}/data innodb_data_file_path = ibdata1:10M:autoextend diff --git a/plugins/mysql/index.py b/plugins/mysql/index.py index 7bbba0647..acf0caa17 100755 --- a/plugins/mysql/index.py +++ b/plugins/mysql/index.py @@ -85,6 +85,14 @@ def getDbPort(): return tmp.groups()[0].strip() +def getDbServerId(): + file = getConf() + content = mw.readFile(file) + rep = 'server-id\s*=\s*(.*)' + tmp = re.search(rep, content) + return tmp.groups()[0].strip() + + def getSocketFile(): file = getConf() content = mw.readFile(file) @@ -1887,13 +1895,14 @@ def getMasterStatus(version=''): data = {} data['mode'] = recognizeDbMode() data['status'] = master_status + data['slave_status'] = False db = pMysqlDb() dlist = db.query('show slave status') - # print(dlist[0]) - if len(dlist) > 0 and (dlist[0]["Slave_IO_Running"] == 'Yes' or dlist[0]["Slave_SQL_Running"] == 'Yes'): - data['slave_status'] = True + for v in dlist: + if v["Slave_IO_Running"] == 'Yes' or v["Slave_SQL_Running"] == 'Yes': + data['slave_status'] = True return mw.returnJson(master_status, '设置成功', data) except Exception as e: @@ -2057,27 +2066,34 @@ def getMasterRepSlaveUserCmd(version): mode = recognizeDbMode() + sid = getDbServerId() + channel_name = "" + if sid != '': + channel_name = " for channel 'r{}';".format(sid) + if mode == "gtid": sql = "CHANGE MASTER TO MASTER_HOST='" + ip + "', MASTER_PORT=" + port + ", MASTER_USER='" + \ clist[0]['username'] + "', MASTER_PASSWORD='" + \ - clist[0]['password'] + "', MASTER_AUTO_POSITION=1" + clist[0]['password'] + "', MASTER_AUTO_POSITION=1" + channel_name if version == '8.0': 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" + clist[0]['password'] + \ + "', MASTER_AUTO_POSITION=1" + 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"]) + "',MASTER_LOG_POS=" + str(mstatus[0]["Position"]) + channel_name if version == "8.0": 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"]) + "',SOURCE_LOG_POS=" + \ + str(mstatus[0]["Position"]) + channel_name data = {} data['cmd'] = sql @@ -2348,48 +2364,17 @@ def updateSlaveSSH(version=''): def getSlaveList(version=''): - db = pMysqlDb() dlist = db.query('show slave status') - ret = [] - for x in range(0, len(dlist)): - tmp = {} - tmp['Master_User'] = dlist[x]["Master_User"] - tmp['Master_Host'] = dlist[x]["Master_Host"] - tmp['Master_Port'] = dlist[x]["Master_Port"] - tmp['Master_Log_File'] = dlist[x]["Master_Log_File"] - tmp['Slave_IO_Running'] = dlist[x]["Slave_IO_Running"] - tmp['Slave_SQL_Running'] = dlist[x]["Slave_SQL_Running"] - tmp['Last_Error'] = dlist[x]["Last_Error"] - tmp['Last_IO_Error'] = dlist[x]["Last_IO_Error"] - tmp['Last_SQL_Error'] = dlist[x]["Last_SQL_Error"] - tmp['Slave_SQL_Running_State'] = dlist[x]["Slave_SQL_Running_State"] - - tmp['Error'] = '' - if tmp['Last_Error'] != '': - tmp['Error'] = tmp['Last_Error'] - - if tmp['Last_IO_Error'] != '': - tmp['Error'] = tmp['Last_IO_Error'] - - if tmp['Last_SQL_Error'] != '': - tmp['Error'] = tmp['Last_SQL_Error'] - - if tmp['Error'] == '': - tmp['Error'] = tmp['Slave_SQL_Running_State'] - - ret.append(tmp) data = {} - data['data'] = ret - + data['data'] = dlist return mw.getJson(data) def getSlaveSyncCmd(version=''): - root = mw.getRunDir() cmd = 'cd ' + root + ' && python3 ' + root + \ - '/plugins/mysql/index.py do_full_sync {"db":"all"}' + '/plugins/mysql/index.py do_full_sync {"db":"all","sign",""}' return mw.returnJson(True, 'ok', cmd) @@ -2424,44 +2409,79 @@ def makeSyncUsercmd(u, version=''): return sql +def parseSlaveSyncCmd(cmd): + a = {} + if cmd.lower().find('for') > 0: + cmd_tmp = cmd.split('for') + cmd = cmd_tmp[0].strip() + + pattern_c = r"channel \'(.*)\';" + match_val = re.match(pattern_c, cmd_tmp[1].strip(), re.I) + if match_val: + m_groups = match_val.groups() + a['channel'] = m_groups[0] + vlist = cmd.split(',') + for i in vlist: + tmp = i.strip() + tmp_a = tmp.split(" ") + real_tmp = tmp_a[len(tmp_a) - 1] + kv = real_tmp.split("=") + a[kv[0]] = kv[1].replace("'", '').replace("'", '').replace(";", '') + return a + + def initSlaveStatusSyncUser(version=''): conn = pSqliteDb('slave_sync_user') - data = conn.field('ip,port,user,pass,mode,cmd').find() - if len(data) < 1: + slave_data = conn.field('ip,port,user,pass,mode,cmd').select() + if len(slave_data) < 1: return mw.returnJson(False, '需要先添加同步用户配置!') # print(data) - db = pMysqlDb() - dlist = db.query('show slave status') - if len(dlist) > 0: - return mw.returnJson(False, '已经初始化好了zz...') + pdb = pMysqlDb() + if len(slave_data) == 1: + dlist = pdb.query('show slave status') + if len(dlist) > 0: + return mw.returnJson(False, '已经初始化好了zz...') - u = data + msg = '' + local_mode = recognizeDbMode() + for x in range(len(slave_data)): + slave_t = slave_data[x] + mode_name = 'classic' + base_t = 'IP:' + slave_t['ip'] + ",PORT:" + \ + slave_t['port'] + ",USER:" + slave_t['user'] - mode_name = 'classic' - if u['mode'] == '1': - mode_name = 'gtid' + if slave_t['mode'] == '1': + mode_name = 'gtid' - local_mode = recognizeDbMode() - if local_mode != mode_name: - return mw.returnJson(False, '同步模式不一致!') + if local_mode != mode_name: + msg += base_t + '->同步模式不一致' + continue - if u['cmd'] == '' and local_mode == 'gtid': - sql = makeSyncUsercmd(u, version) - # print(sql) - t = db.query(sql) - else: - if u['cmd'] == '': - return mw.returnJson(False, '经典模式下,必须手写同步命令!') + cmd_sql = slave_t['cmd'] + if cmd_sql == '': + msg += base_t + '->同步命令不能为空' + continue + + try: + pinfo = parseSlaveSyncCmd(cmd_sql) + except Exception as e: + return mw.returnJson(False, base_t + '->CMD同步命令不合规范!') # print(u['cmd']) - t = db.query(u['cmd']) - isError = isSqlError(t) - if isError: - return isError + t = pdb.query(cmd_sql) + isError = isSqlError(t) + if isError: + return isError - db.query("start slave user='{}' password='{}';".format( - u['user'], u['pass'])) - return mw.returnJson(True, '初始化成功!') + # pdb.query("start slave user='{}' password='{}';".format( + # u['user'], u['pass'])) + + pdb.query("start slave") + pdb.query("start all slaves ") + + if msg == '': + msg = '初始化成功!' + return mw.returnJson(True, msg) def initSlaveStatusSSH(version=''): @@ -2589,9 +2609,18 @@ def setSlaveStatusSSH(version=''): def deleteSlave(version=''): + args = getArgs() db = pMysqlDb() - dlist = db.query('stop slave') - dlist = db.query('reset slave all') + if 'sign' in args: + sign = args['sign'] + + db.query("stop slave for channel '{}'".format(sign)) + # db.query("stop slave '{}'".format(sign)) + # db.query("reset slave '{}' all".format(sign)) + else: + db.query('stop slave') + db.query('reset slave all') + return mw.returnJson(True, '删除成功!') @@ -2630,9 +2659,6 @@ def dumpMysqlData(version=''): def writeDbSyncStatus(data): path = '/tmp/db_async_status.txt' - # status_data['code'] = 1 - # status_data['msg'] = '主服务器备份完成...' - # status_data['progress'] = 30 mw.writeFile(path, json.dumps(data)) @@ -2650,16 +2676,22 @@ def doFullSync(version=''): def doFullSyncUser(version=''): args = getArgs() - data = checkArgs(args, ['db']) + data = checkArgs(args, ['db', 'sign']) if not data[0]: return data[1] sync_db = args['db'] + sync_sign = args['sign'] db = pMysqlDb() conn = pSqliteDb('slave_sync_user') - data = conn.field('ip,port,user,pass,mode,cmd').find() + if sync_sign != '': + data = conn.field('ip,port,user,pass,mode,cmd').where( + 'ip=?', (sync_sign,)).find() + else: + data = conn.field('ip,port,user,pass,mode,cmd').find() + user = data['user'] apass = data['pass'] port = data['port'] @@ -2696,7 +2728,9 @@ def doFullSyncUser(version=''): db.query("start slave") writeDbSyncStatus({'code': 6, 'msg': '从库重启完成...', 'progress': 100}) - os.system("rm -rf " + bak_file) + + if os.path.exists(bak_file): + os.system("rm -rf " + bak_file) return True @@ -2832,11 +2866,16 @@ def fullSync(version=''): if not data[0]: return data[1] + sign = '' + if 'sign' in args: + sign = args['sign'] + status_file = '/tmp/db_async_status.txt' if args['begin'] == '1': cmd = 'cd ' + mw.getRunDir() + ' && python3 ' + \ getPluginDir() + \ - '/index.py do_full_sync {"db":"' + args['db'] + '"} &' + '/index.py do_full_sync {"db":"' + \ + args['db'] + '","sign":"' + sign + '"} &' print(cmd) mw.execShell(cmd) return json.dumps({'code': 0, 'msg': '同步数据中!', 'progress': 0}) diff --git a/plugins/mysql/js/mysql.js b/plugins/mysql/js/mysql.js index 3db0fb818..e32cce77f 100755 --- a/plugins/mysql/js/mysql.js +++ b/plugins/mysql/js/mysql.js @@ -1691,12 +1691,12 @@ function getMasterRepSlaveListPage(){ } -function deleteSlave(){ - myPost('delete_slave', {}, function(data){ +function deleteSlave(sign){ + myPost('delete_slave', {sign:sign}, function(data){ var rdata = $.parseJSON(data.data); showMsg(rdata['msg'], function(){ masterOrSlaveConf(); - },{},3000); + },{icon:rdata.status?1:2,time:3000},3000); }); } @@ -1704,28 +1704,70 @@ function deleteSlave(){ function getFullSyncStatus(db){ var timeId = null; - var btn = '
开始
'; - var loadOpen = layer.open({ - type: 1, - title: '全量同步['+db+']', - area: '500px', - content:"
\ -
\ - \ -
\ -
0%
\ -
\ -
\ - "+btn+"\ -
", - cancel: function(){ - clearInterval(timeId); + myPost('get_slave_list', {page:1,page_size:100}, function(data){ + var rdata = $.parseJSON(data.data); + var rsource = rdata.data; + + if (db == 'ALL' && rsource.length>1){ + layer.msg("多主不支持该模式!",{icon:2}); + return; + } + + var dataSource = ''; + if (rsource.length>1){ + var sourceList = ''; + for (var i = 0; i < rsource.length; i++) { + if ('Channel_Name' in rsource[i]){ + sourceList += ''; + } + } + + dataSource = "

\ + 同步数据源：\ + \ +

"; } + + layer.open({ + type: 1, + title: '全量同步['+db+']', + area: '500px', + content:"
\ +
\ + "+dataSource+"\ + \ +
\ +
0%
\ +
\ +
\ +
\ + 开始\ +
\ +
", + cancel: function(){ + clearInterval(timeId); + }, + success:function(){ + $('#begin_full_sync').click(function(){ + var val = $(this).data('status'); + var sign = $('select[name="data_source"]').val(); + if (val == 'init'){ + fullSync(db, sign, 1); + timeId = setInterval(function(){ + fullSync(db,sign,0); + }, 1000); + $(this).data('status','starting'); + } else { + layer.msg("正在同步中..",{icon:0}); + } + }); + } + }); }); - function fullSync(db,begin){ + function fullSync(db,sign,begin){ - myPostN('full_sync', {db:db,begin:begin}, function(data){ + myPostN('full_sync', {db:db,sign:sign,begin:begin}, function(data){ var rdata = $.parseJSON(data.data); $('#full_msg').text(rdata['msg']); $('.progress-bar').css('width',rdata['progress']+'%'); @@ -1920,7 +1962,7 @@ function addSlaveSyncUser(ip=''){
同步账户
\
同步密码
\
\ - CMD[最好填好]\ + CMD[必须填写]\
\
\ \ @@ -2098,7 +2140,7 @@ function getSlaveUserList(){ layerId = layer.open({ type: 1, title: '同步账户列表', - area: '500px', + area: '600px', content:"
\
\
\ @@ -2122,7 +2164,7 @@ function getSlaveSSHList(page=1){ layerId = layer.open({ type: 1, title: 'SSH列表', - area: '500px', + area: '600px', content:"
\
\
\ @@ -2230,10 +2272,16 @@ function masterOrSlaveConf(version=''){ myPost('get_slave_list', _data, function(data){ var rdata = $.parseJSON(data.data); var list = ''; + + var isHasSign = false; for(i in rdata.data){ var v = rdata.data[i]; - var status = "异常"; + if ('Channel_Name' in v){ + isHasSign = true; + } + + var status = "异常"; if (v['Slave_SQL_Running'] == 'Yes' && v['Slave_IO_Running'] == 'Yes'){ status = "正常"; } @@ -2245,13 +2293,23 @@ function masterOrSlaveConf(version=''){ list += ''; list += ''; list += ''; + + if (isHasSign){ + list += ''; + } + list += ''; list += ''; list += ''; } + var signThead_th = ''; + if (isHasSign){ + var signThead_th = ''; + } + var con = '
\
\
' + rdata.data[i]['Master_Log_File'] +'' + rdata.data[i]['Slave_IO_Running'] +'' + rdata.data[i]['Slave_SQL_Running'] +'' + v['Channel_Name'] +'' + status +'' + - '删除' + + '删除' + '
标识
\ @@ -2262,6 +2320,7 @@ function masterOrSlaveConf(version=''){ \ \ \ + '+signThead_th+'\ \ \ \ @@ -2276,22 +2335,74 @@ function masterOrSlaveConf(version=''){ // $(".table_slave_status_list").html(con); - $('.db_error').click(function(){ + $(".btn_delete_slave").click(function(){ + var id = $(this).data('id'); + var v = rdata.data[id]; + if ('Channel_Name' in v){ + deleteSlave(v['Channel_Name']); + } else{ + deleteSlave(); + } + }); + + $('.db_error').click(function(){ + var id = $(this).data('id'); + var info = rdata.data[id]; + + var err_line = ""; + err_line +="\ + \ + \ + "; + err_line +="\ + \ + \ + "; + + err_line +="\ + \ + \ + "; + layer.open({ type: 1, title: '同步异常信息', - area: '500px', - content:"
\ -
"+v['Error']+"
\ -
\ - \ + area: ['600px','300px'], + btn:['复制错误',"取消"], + content:"\ +
\ +
\ +
日志IOSQL状态操作
IO错误"+ (info['Last_IO_Error'] == '' ? '无':info['Last_IO_Error'])+"
SQL错误"+(info['Last_SQL_Error'] == '' ? '无':info['Last_SQL_Error'])+"
状态"+(info['Slave_SQL_Running_State'] == '' ? '无':info['Slave_SQL_Running_State']) +"
\ + \ + \ + \ + \ + "+ err_line +"\ +
类型内容
\ +
\
\ - ", + ", success:function(){ - copyText(v['Error']); - $('.class-copy-db-err').click(function(){ - copyText(v['Error']); - }); + // copyText(v['Error']); + // $('.class-copy-db-err').click(function(){ + // copyText(v['Error']); + // }); + }, + yes:function(){ + if (info['Last_IO_Error'] != ''){ + copyText(info['Last_IO_Error']); + return; + } + + if (info['Last_SQL_Error'] != ''){ + copyText(info['Last_SQL_Error']); + return; + } + + if (info['Slave_SQL_Running_State'] != ''){ + copyText(info['Slave_SQL_Running_State']); + return; + } } }); });