Merge remote-tracking branch 'origin/master'

# Conflicts: # diag_cmd.py
oceanbase · Jul 16, 2024 · bd762e1 · bd762e1
2 parents b36d08a + 94d20d7
commit bd762e1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/diag_cmd.py b/diag_cmd.py
@@ -901,8 +901,6 @@ def __init__(self):
         self.register_command(ObdiagGatherObproxyLogCommand())
         self.register_command(ObdiagGatherSceneCommand())
         self.register_command(ObdiagGatherAshReportCommand())
-        self.register_command(ObdiagGatherParameterCommand())
-        self.register_command(ObdiagGatherVariableCommand())
         self.register_command(ObdiagGatherTableDumpHandler())
         self.register_command(ObdiagGatherParameterCommand())
         self.register_command(ObdiagGatherVariableCommand())
@@ -926,8 +924,6 @@ def __init__(self):
         self.register_command(ObdiagAnalyzeVariableCommand())
         self.register_command(ObdiagAnalyzeSQLCommand())
         self.register_command(ObdiagAnalyzeSQLReviewCommand())
-        self.register_command(ObdiagAnalyzeParameterCommand())
-        self.register_command(ObdiagAnalyzeVariableCommand())
 
 
 class ObdiagRCACommand(MajorCommand):

diff --git a/handler/analyzer/analyze_variable.py b/handler/analyzer/analyze_variable.py
@@ -88,7 +88,7 @@ def init_option(self):
                 self.variable_file_name = os.path.abspath(offline_file_option)
                 self.check_file_valid()
         else:
-            self.stdio.error("an initialization variable file must be provided to find the parts where variables have changed.")
+            self.stdio.error("args --file need provided to find the parts where variables have changed.")
             exit(-1)
 
         if store_dir_option and store_dir_option != "./":