diff --git a/plugins/mariadb/index.py b/plugins/mariadb/index.py index 24dcd8b56..d146b4f40 100755 --- a/plugins/mariadb/index.py +++ b/plugins/mariadb/index.py @@ -2183,7 +2183,7 @@ def getSlaveList(version=''): def getSlaveSyncCmd(version=''): root = mw.getRunDir() cmd = 'cd ' + root + ' && python3 ' + root + \ - '/plugins/mariadb/index.py do_full_sync {"db":"all"}' + '/plugins/mariadb/index.py do_full_sync {"db":"all","sign":""}' return mw.returnJson(True, 'ok', cmd) @@ -2423,9 +2423,6 @@ def asyncTmpfile(): def writeDbSyncStatus(data): path = asyncTmpfile() - # status_data['code'] = 1 - # status_data['msg'] = '主服务器备份完成...' - # status_data['progress'] = 30 mw.writeFile(path, json.dumps(data)) diff --git a/plugins/mariadb/js/mariadb.js b/plugins/mariadb/js/mariadb.js index 770746d29..1937abd56 100755 --- a/plugins/mariadb/js/mariadb.js +++ b/plugins/mariadb/js/mariadb.js @@ -1681,6 +1681,11 @@ function getFullSyncStatus(db){ var rdata = $.parseJSON(data.data); var rsource = rdata.data; // console.log(rdata); + + if (db == 'ALL' && rsource.length>1){ + layer.msg("多主不支持该模式!",{icon:2}); + return; + } var dataSource = ''; if (rsource.length>1){