diff --git a/plugins/mysql-yum/index.py b/plugins/mysql-yum/index.py index 904be3be9..46ace42ef 100755 --- a/plugins/mysql-yum/index.py +++ b/plugins/mysql-yum/index.py @@ -1999,8 +1999,11 @@ def getMasterStatus(version=''): query_status_cmd = 'show slave status' mdb8 = getMdb8Ver() + is_mdb8 = False if mw.inArray(mdb8, version): + is_mdb8 = True query_status_cmd = 'show replica status' + try: conf = getConf() @@ -2019,8 +2022,12 @@ def getMasterStatus(version=''): dlist = db.query(query_status_cmd) # 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 + if is_mdb8: + if len(dlist) > 0 and (dlist[0]["Replica_IO_Running"] == 'Yes' or dlist[0]["Replica_SQL_Running"] == 'Yes'): + data['slave_status'] = True + else: + if len(dlist) > 0 and (dlist[0]["Slave_IO_Running"] == 'Yes' or dlist[0]["Slave_SQL_Running"] == 'Yes'): + data['slave_status'] = True return mw.returnJson(master_status, '设置成功', data) except Exception as e: diff --git a/plugins/mysql/index.py b/plugins/mysql/index.py index 2794a90e1..6e626d218 100755 --- a/plugins/mysql/index.py +++ b/plugins/mysql/index.py @@ -2203,8 +2203,10 @@ def getMasterStatus(version=''): return mw.returnJson(False, 'MySQL未启动,或正在启动中...!', []) query_status_cmd = 'show slave status' + is_mdb8 = False mdb8 = getMdb8Ver() if mw.inArray(mdb8, version): + is_mdb8 = True query_status_cmd = 'show replica status' try: @@ -2226,8 +2228,13 @@ def getMasterStatus(version=''): dlist = db.query(query_status_cmd) for v in dlist: - if v["Slave_IO_Running"] == 'Yes' or v["Slave_SQL_Running"] == 'Yes': - data['slave_status'] = True + + if is_mdb8: + if (v["Replica_IO_Running"] == 'Yes' or v["Replica_SQL_Running"] == 'Yes'): + data['slave_status'] = True + else: + 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: