Merge remote-tracking branch 'origin/3.1.0-update' into 3.1.0-update

oceanbase · Jan 23, 2025 · d6eaf06 · d6eaf06
2 parents a0ba4f3 + adee037
commit d6eaf06
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/handler/analyzer/analyze_memory.py b/src/handler/analyzer/analyze_memory.py
@@ -23,7 +23,7 @@
 import tabulate
 import threading
 import uuid
-from src.common.command import get_observer_version_by_sql
+from src.common.command import get_observer_version
 from src.common.tool import DirectoryUtil, TimeUtils, Util, NetUtils, FileUtil
 from src.common.obdiag_exception import OBDIAGFormatException
 from src.common.constant import const
@@ -130,7 +130,7 @@ def init_option(self):
     def get_version(self):
         observer_version = ""
         try:
-            observer_version = get_observer_version_by_sql(self.context, self.ob_cluster)
+            observer_version = get_observer_version(self.context)
         except Exception as e:
             self.stdio.exception("failed to get observer version:{0}".format(e))
         self.stdio.verbose("get observer version: {0}".format(observer_version))

diff --git a/src/handler/analyzer/analyze_queue.py b/src/handler/analyzer/analyze_queue.py
@@ -19,7 +19,7 @@
 import os
 import csv
 from tabulate import tabulate
-from src.common.command import get_observer_version_by_sql
+from src.common.command import get_observer_version
 from src.common.ssh_client.local_client import LocalClient
 from src.handler.base_shell_handler import BaseShellHandler
 from src.common.obdiag_exception import OBDIAGFormatException, OBDIAGDBConnException
@@ -157,7 +157,7 @@ def init_option(self):
     def get_version(self):
         observer_version = ""
         try:
-            observer_version = get_observer_version_by_sql(self.context, self.ob_cluster)
+            observer_version = get_observer_version(self.context)
         except Exception as e:
             self.stdio.warn("AnalyzeQueueHandler failed to get observer version:{0}".format(e))
         self.stdio.verbose("AnalyzeQueueHandler get observer version: {0}".format(observer_version))