From 91a3b0d6595ec0aa8c19d43a3179470d45c949ae Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Mon, 10 Jun 2024 17:04:31 +0800 Subject: [PATCH] update --- plugins/mysql-yum/index.py | 7 ++++++- plugins/mysql-yum/install.sh | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/plugins/mysql-yum/index.py b/plugins/mysql-yum/index.py index 179b9b53b..a84f86cd3 100755 --- a/plugins/mysql-yum/index.py +++ b/plugins/mysql-yum/index.py @@ -1992,6 +1992,10 @@ def setDbSlave(version): def getMasterStatus(version=''): + query_status_cmd = 'show slave status' + mdb8 = ['8.0','8.1','8.2','8.3','8.4'] + if mw.inArray(mdb8, version): + query_status_cmd = 'show replica status' try: if status(version) == 'stop': return mw.returnJson(False, 'MySQL未启动,或正在启动中...!', []) @@ -2009,7 +2013,7 @@ def getMasterStatus(version=''): data['status'] = master_status db = pMysqlDb() - dlist = db.query('show slave status') + 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'): @@ -2017,6 +2021,7 @@ def getMasterStatus(version=''): return mw.returnJson(master_status, '设置成功', data) except Exception as e: + mw.getTracebackInfo() return mw.returnJson(False, "数据库密码错误,在管理列表-点击【修复】,"+str(e), 'pwd') diff --git a/plugins/mysql-yum/install.sh b/plugins/mysql-yum/install.sh index 5d2d26d84..4ca461453 100755 --- a/plugins/mysql-yum/install.sh +++ b/plugins/mysql-yum/install.sh @@ -11,6 +11,7 @@ serverPath=$(dirname "$rootPath") # cd /www/server/mdserver-web/plugins/mysql-yum && bash install.sh install 8.4 # cd /www/server/mdserver-web/plugins/mysql-yum && bash install.sh uninstall 8.0 # cd /www/server/mdserver-web && python3 /www/server/mdserver-web/plugins/mysql-yum/index.py start 8.0 +# cd /www/server/mdserver-web && python3 /www/server/mdserver-web/plugins/mysql-yum/index.py get_master_status 8.4 install_tmp=${rootPath}/tmp/mw_install.pl