up

plugins/mysql/index.py

@@ -1514,11 +1514,32 @@ def async(f):
     return wrapper
 
 
-def doFullSync(dbname):
+def doFullSync():
+
+    args = getArgs()
+    data = checkArgs(args, ['db'])
+    if not data[0]:
+        return data[1]
+
+    status_data = {}
+    status_data['progress'] = 5
 
     db = pMysqlDb()
+
+    dlist = db.query('show slave status')
+    if len(dlist) == 0:
+        status_data['code'] = -1
+        status_data['msg'] = '没有启动...'
+
+    ip = dlist[0][1]
+    print(ip)
+
     status_file = '/tmp/db_async_status.txt'
 
+    status_data['code'] = 0
+    status_data['msg'] = '运行中...'
+    mw.writeFile(status_file, json.dumps(status_data))
+
     import paramiko
     paramiko.util.log_to_file('paramiko.log')
     ssh = paramiko.SSHClient()
@@ -1526,52 +1547,79 @@ def doFullSync(dbname):
     SSH_PRIVATE_KEY = '/Users/midoks/.ssh/id_rsa'
     key = paramiko.RSAKey.from_private_key_file(SSH_PRIVATE_KEY)
     ssh.load_system_host_keys()
-    ssh.connect(hostname='8.210.55.220', port=22, username='root', pkey=key)
-    cmd = "cd /www/server/mdserver-web && python /www/server/mdserver-web/plugins/mysql/index.py dump_mysql_data {\"db\":'" + dbname + "'}"
+    ssh.connect(hostname=ip, port=22, username='root', pkey=key)
+    cmd = "cd /www/server/mdserver-web && python /www/server/mdserver-web/plugins/mysql/index.py dump_mysql_data {\"db\":'" + args[
+        'db'] + "'}"
     stdin, stdout, stderr = ssh.exec_command(cmd)
     result = stdout.read()
     result_err = stderr.read()
 
     if result == 'ok':
-        mw.writeFile(status_file, '1')
+        status_data['code'] = 1
+        status_data['msg'] = '主服务器备份完成...'
+        status_data['progress'] = 30
+        mw.writeFile(status_file, json.dumps(status_data))
 
-    r = mw.execShell('scp root@8.210.55.220:/tmp/dump.sql /tmp')
+    r = mw.execShell('scp root@' + ip + ':/tmp/dump.sql /tmp')
     if r[0] == '':
-        mw.writeFile(status_file, '2')
+        status_data['code'] = 2
+        status_data['msg'] = '数据同步本地完成...'
+        status_data['progress'] = 40
+        mw.writeFile(status_file, json.dumps(status_data))
 
     cmd = 'cd /www/server/mdserver-web && python /www/server/mdserver-web/plugins/mysql/index.py get_master_rep_slave_user_cmd {"username":"","db":""}'
     stdin, stdout, stderr = ssh.exec_command(cmd)
     result = stdout.read()
     result_err = stderr.read()
-
     cmd_data = json.loads(result)
 
     db.query('stop slave')
-    mw.writeFile(status_file, '3')
+    status_data['code'] = 3
+    status_data['msg'] = '停止从库完成...'
+    status_data['progress'] = 45
+    mw.writeFile(status_file, json.dumps(status_data))
 
     dlist = db.query(cmd_data['data'])
-    print(cmd_data['data'], dlist)
+    status_data['code'] = 4
+    status_data['msg'] = '刷新库信息完成...'
+    status_data['progress'] = 50
+    mw.writeFile(status_file, json.dumps(status_data))
 
     pwd = pSqliteDb('config').where('id=?', (1,)).getField('mysql_root')
     cmd = getServerDir() + "/bin/mysql -uroot -p" + pwd + " < /tmp/dump.sql"
-    print mw.execShell(cmd)
-    mw.writeFile(status_file, '4')
+    status_data['code'] = 5
+    status_data['msg'] = '同步数据完成...'
+    status_data['progress'] = 90
+    mw.writeFile(status_file, json.dumps(status_data))
+
     db.query('start slave')
-    mw.writeFile(status_file, '5')
+    status_data['code'] = 6
+    status_data['msg'] = '从库重启完成...'
+    status_data['progress'] = 100
+    mw.writeFile(status_file, json.dumps(status_data))
 
     return True
 
 
 def fullSync(version=''):
     args = getArgs()
-    data = checkArgs(args, ['db'])
+    data = checkArgs(args, ['db', 'begin'])
     if not data[0]:
         return data[1]
 
-    doFullSync(args['db'])
+    status_file = '/tmp/db_async_status.txt'
+    if args['begin'] == '1':
+        if not os.path.exists(status_file):
+            cmd = 'cd ' + mw.getRunDir() + ' && python ' + \
+                getPluginDir() + '/index.py do_full_sync {"db":""} &'
+            mw.execShell(cmd)
+
+    if os.path.exists(status_file):
+        c = mw.readFile(status_file)
+        d = json.loads(c)
+        return c
 
-    # restart(version)
-    return mw.returnJson(True, '同步成功!')
+    return json.dumps({'code': 0, 'msg': '点击开始,开始导入!', 'progress': 0})
 
 if __name__ == "__main__":
     func = sys.argv[1]
@@ -1672,6 +1720,8 @@ if __name__ == "__main__":
         print(deleteSlave(version))
     elif func == 'full_sync':
         print(fullSync(version))
+    elif func == 'do_full_sync':
+        print(doFullSync())
     elif func == 'dump_mysql_data':
         print(dumpMysqlData(version))
     else:

plugins/mysql/js/mysql.js

@@ -36,6 +36,26 @@ function myPost(method,args,callback, title){
     },'json'); 
 }
 
+function myPostN(method,args,callback, title){
+
+    var _args = null; 
+    if (typeof(args) == 'string'){
+        _args = JSON.stringify(str2Obj(args));
+    } else {
+        _args = JSON.stringify(args);
+    }
+
+    var _title = '正在获取...';
+    if (typeof(title) != 'undefined'){
+        _title = title;
+    }
+    $.post('/plugins/run', {name:'mysql', func:method, args:_args}, function(data) {
+        if(typeof(callback) == 'function'){
+            callback(data);
+        }
+    },'json'); 
+}
+
 function myAsyncPost(method,args){
     var _args = null; 
     if (typeof(args) == 'string'){
@@ -1345,10 +1365,11 @@ function getFullSyncStatus(db){
     var btn = '<div class="table_toolbar"><span class="sync btn btn-default btn-sm" id="begin_full_sync" title="">开始</span></div>';
     var loadOpen = layer.open({
         type: 1,
-        title: '全量同步['+db+']',
+        title: '全量同步',
         area: '500px',
         content:"<div class='bt-form pd20 c6'>\
                  <div class='divtable mtb10'>\
+                    <span id='full_msg'></span>\
                     <div class='progress'>\
                         <div class='progress-bar' role='progressbar' aria-valuenow='0' aria-valuemin='0' aria-valuemax='100' style='min-width: 2em;'>0%</div>\
                     </div>\
@@ -1357,20 +1378,36 @@ function getFullSyncStatus(db){
             </div>"
     });
 
+    var timeId = setInterval(function(){
+        fullSync(db,0);
+    }, 1000);
+
+    function fullSync(db,begin){
        
-    function fullSync(db){
-        myPost('full_sync', {db:db}, function(data){
+        myPostN('full_sync', {db:db,begin:begin}, function(data){
             var rdata = $.parseJSON(data.data);
-            layer.msg(rdata['msg']);
-            setTimeout(function(){
-                masterOrSlaveConf();
-            }, 3000);
+            $('#full_msg').text(rdata['msg']);
+            $('.progress-bar').css('width',rdata['progress']+'%');
+            $('.progress-bar').text(rdata['progress']+'%');
+
+            if (rdata['code']==6 ||rdata['code']<0){
+                layer.msg(rdata['msg']);
+                clearInterval(timeId);
+            }
         });
     }
 
-    fullSync(db);
+    fullSync(db,0);
     $('#begin_full_sync').click(function(){
-        fullSync(db);
+        fullSync(db,1);
+
+        timeId= setTimeout(function(){
+            fullSync(db,0);
+        }, 1000);
+    });
+
+    $('.layui-layer-close1').click(function(){
+        clearInterval(timeId);
     });
 }
 
@@ -1487,7 +1524,7 @@ function masterOrSlaveConf(version=''){
                 list += '<tr>';
                 list += '<td>' + rdata.data[i]['name'] +'</td>';
                 list += '<td style="text-align:right">' + 
-                    '<a href="javascript:;" class="btlink" onclick="getFullSyncStatus(\''+rdata.data[i]['name']+'\')" title="全量同步">全量同步</a>' +
+                    '<a href="javascript:;" class="btlink" onclick="alert(\'dev\');" title="修复">修复</a>' +
                 '</td>';
                 list += '</tr>';
             }
@@ -1504,7 +1541,8 @@ function masterOrSlaveConf(version=''){
                     </div>\
                     <div id="databasePage" class="dataTables_paginate paging_bootstrap page"></div>\
                     <div class="table_toolbar">\
-                        <span class="sync btn btn-default btn-sm" onclick="getMasterRepSlaveList()" title="">设置主服务器密钥</span>\
+                        <span class="sync btn btn-default btn-sm" onclick="getMasterRepSlaveList()" title="设置主服务器密钥">设置主服务器密钥</span>\
+                        <span class="sync btn btn-default btn-sm" onclick="getFullSyncStatus(\'test\')" title="全量同步">全量同步</span>\
                     </div>\
                 </div>';