From 26c06f6a9d920dff296173cec7bcb6557257617a Mon Sep 17 00:00:00 2001
From: zhang_xubo <2578876417@qq.com>
Date: Thu, 29 Jul 2021 20:34:16 +0800
Subject: [PATCH] fix error of get instance num

---
 script/gspylib/common/DbClusterInfo.py | 7 +++++--
 script/local/Resetreplconninfo.py      | 8 ++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/script/gspylib/common/DbClusterInfo.py b/script/gspylib/common/DbClusterInfo.py
index 6a41a882..e871287d 100644
--- a/script/gspylib/common/DbClusterInfo.py
+++ b/script/gspylib/common/DbClusterInfo.py
@@ -6106,8 +6106,11 @@ class dbClusterInfo():
                                 " Error: \n%s." % str(output) +
                                 "The cmd is %s" % cmd)
         output_list = self.__getStatusByOM(user)
-        output_last_info = output_list[-1].split()
-        output_num = int(output_last_info[0])
+        output_num = 0
+        pattern = re.compile("(\d+) (.*) (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) (.*)")
+        for contont in output_list:
+            if pattern.search(contont):
+                output_num += 1
         tempstatus = output_list[-output_num:]
         statusdic = {'Primary': 0, 'Standby': 1, 'Cascade': 3, 'Unknown': 9}
         try:
diff --git a/script/local/Resetreplconninfo.py b/script/local/Resetreplconninfo.py
index 225dcd91..b8813bd2 100644
--- a/script/local/Resetreplconninfo.py
+++ b/script/local/Resetreplconninfo.py
@@ -23,6 +23,7 @@ import getopt
 import os
 import sys
 import subprocess
+import re
 
 sys.path.append(sys.path[0] + "/../")
 from gspylib.common.GaussLog import GaussLog
@@ -140,8 +141,11 @@ class Resetreplconninfo():
         output: NA
         """
         output_list = self.__getStatusByOM()
-        output_last_info = output_list[-1].split()
-        output_num = int(output_last_info[0])
+        output_num = 0
+        pattern = re.compile("(\d+) (.*) (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) (.*)")
+        for contont in output_list:
+            if pattern.search(contont):
+                output_num += 1
         status_list = output_list[-output_num:]
         repl_list = ['replconninfo' + str(i) for i in
                      range(1, len(status_list))]
-- 
Gitee