obdiag添加参数收集和对比功能 (#307)

* obdiag gather and analyze parameters/variables * obdiag gather and analyze parameters/variables * obdiag gather and analyze parameters/variables * obdiag gather and analyze parameters/variables
oceanbase · Jul 8, 2024 · bdaba21 · bdaba21
1 parent e1a9bec
commit bdaba21
Show file tree

Hide file tree

Showing 6 changed files with 744 additions and 0 deletions.
diff --git a/core.py b/core.py
@@ -32,6 +32,8 @@
 from err import CheckStatus, SUG_SSH_FAILED
 from handler.analyzer.analyze_flt_trace import AnalyzeFltTraceHandler
 from handler.analyzer.analyze_log import AnalyzeLogHandler
+from handler.analyzer.analyze_parameter import AnalyzeParameterHandler
+from handler.analyzer.analyze_variable import AnalyzeVariableHandler
 from handler.checker.check_handler import CheckHandler
 from handler.checker.check_list import CheckListHandler
 from handler.gather.gather_log import GatherLogHandler
@@ -44,6 +46,8 @@
 from handler.gather.gather_plan_monitor import GatherPlanMonitorHandler
 from handler.gather.gather_scenes import GatherSceneHandler
 from handler.gather.scenes.list import GatherScenesListHandler
+from handler.gather.gather_parameters import GatherParametersHandler
+from handler.gather.gather_variables import GatherVariablesHandler
 from telemetry.telemetry import telemetry
 from update.update import UpdateHandler
 from colorama import Fore, Style
@@ -230,6 +234,12 @@ def gather_function(self, function_type, opt):
             elif function_type == 'gather_ash_report':
                 handler = GatherAshReportHandler(self.context)
                 return handler.handle()
+            elif function_type == 'gather_parameters':
+                handler = GatherParametersHandler(self.context)
+                return handler.handle()
+            elif function_type == 'gather_variables':
+                handler = GatherVariablesHandler(self.context)
+                return handler.handle()
             else:
                 self._call_stdio('error', 'Not support gather function: {0}'.format(function_type))
                 return False
@@ -268,6 +278,18 @@ def analyze_fuction(self, function_type, opt):
                 self.set_context(function_type, 'analyze', config)
                 handler = AnalyzeFltTraceHandler(self.context)
                 handler.handle()
+            elif function_type == 'analyze_parameter_non_default':
+                self.set_context(function_type, 'analyze', config)
+                handler = AnalyzeParameterHandler(self.context, 'non_default')
+                handler.handle()
+            elif function_type == 'analyze_parameter_diff':
+                self.set_context_skip_cluster_conn(function_type, 'analyze', config)
+                handler = AnalyzeParameterHandler(self.context, 'diff')
+                handler.handle()
+            elif function_type == 'analyze_variable':
+                self.set_context(function_type, 'analyze', config)
+                handler = AnalyzeVariableHandler(self.context)
+                handler.handle()
             else:
                 self._call_stdio('error', 'Not support analyze function: {0}'.format(function_type))
                 return False

diff --git a/diag_cmd.py b/diag_cmd.py
@@ -374,6 +374,38 @@ def _do_command(self, obdiag):
         return obdiag.gather_function('gather_log', self.opts)
 
 
+class ObdiagGatherParameterCommand(ObdiagOriginCommand):
+
+    def __init__(self):
+        super(ObdiagGatherParameterCommand, self).__init__('parameter', 'Gather oceanbase parameters from oceanbase database')
+        self.parser.add_option('--store_dir', type='string', help='the dir to store gather result, current dir by default.', default='./')
+        self.parser.add_option('-c', type='string', help='obdiag custom config', default=os.path.expanduser('~/.obdiag/config.yml'))
+
+    def init(self, cmd, args):
+        super(ObdiagGatherParameterCommand, self).init(cmd, args)
+        self.parser.set_usage('%s [options]' % self.prev_cmd)
+        return self
+
+    def _do_command(self, obdiag):
+        return obdiag.gather_function('gather_parameters', self.opts)
+
+
+class ObdiagGatherVariableCommand(ObdiagOriginCommand):
+
+    def __init__(self):
+        super(ObdiagGatherVariableCommand, self).__init__('variable', 'Gather oceanbase variables from oceanbase database')
+        self.parser.add_option('--store_dir', type='string', help='the dir to store gather result, current dir by default.', default='./')
+        self.parser.add_option('-c', type='string', help='obdiag custom config', default=os.path.expanduser('~/.obdiag/config.yml'))
+
+    def init(self, cmd, args):
+        super(ObdiagGatherVariableCommand, self).init(cmd, args)
+        self.parser.set_usage('%s [options]' % self.prev_cmd)
+        return self
+
+    def _do_command(self, obdiag):
+        return obdiag.gather_function('gather_variables', self.opts)
+
+
 class ObdiagGatherSysStatCommand(ObdiagOriginCommand):
 
     def __init__(self):
@@ -630,6 +662,61 @@ def _do_command(self, obdiag):
         return obdiag.analyze_fuction('analyze_flt_trace', self.opts)
 
 
+class ObdiagAnalyzeParameterDiffCommand(ObdiagOriginCommand):
+    def __init__(self):
+        super(ObdiagAnalyzeParameterDiffCommand, self).__init__('diff', 'Analyze the parameter configurations between observers and identify the parameters with different values among the observers')
+        self.parser.add_option('--file', type='string', help="specify initialization parameter file")
+        self.parser.add_option('--store_dir', type='string', help='the dir to store gather result, current dir by default.', default='./')
+        self.parser.add_option('-c', type='string', help='obdiag custom config', default=os.path.expanduser('~/.obdiag/config.yml'))
+
+    def init(self, cmd, args):
+        super(ObdiagAnalyzeParameterDiffCommand, self).init(cmd, args)
+        self.parser.set_usage('%s [options]' % self.prev_cmd)
+        return self
+
+    def _do_command(self, obdiag):
+        return obdiag.analyze_fuction('analyze_parameter_diff', self.opts)
+
+
+class ObdiagAnalyzeParameterNonDefaultCommand(ObdiagOriginCommand):
+    def __init__(self):
+        super(ObdiagAnalyzeParameterNonDefaultCommand, self).__init__('non-default', 'Analyze the parameter to identify parameters with non-default values')
+        self.parser.add_option('--file', type='string', help="specify initialization parameter file")
+        self.parser.add_option('--store_dir', type='string', help='the dir to store gather result, current dir by default.', default='./')
+        self.parser.add_option('-c', type='string', help='obdiag custom config', default=os.path.expanduser('~/.obdiag/config.yml'))
+
+    def init(self, cmd, args):
+        super(ObdiagAnalyzeParameterNonDefaultCommand, self).init(cmd, args)
+        self.parser.set_usage('%s [options]' % self.prev_cmd)
+        return self
+
+    def _do_command(self, obdiag):
+        return obdiag.analyze_fuction('analyze_parameter_non_default', self.opts)
+
+
+class ObdiagAnalyzeParameterCommand(MajorCommand):
+    def __init__(self):
+        super(ObdiagAnalyzeParameterCommand, self).__init__('parameter', 'Analyze oceanbase parameters info')
+        self.register_command(ObdiagAnalyzeParameterDiffCommand())
+        self.register_command(ObdiagAnalyzeParameterNonDefaultCommand())
+
+
+class ObdiagAnalyzeVariableCommand(ObdiagOriginCommand):
+    def __init__(self):
+        super(ObdiagAnalyzeVariableCommand, self).__init__('variable', 'Analyze and identify variables that have changed compared to the specified variable file')
+        self.parser.add_option('--file', type='string', help="specify initialization parameter file")
+        self.parser.add_option('--store_dir', type='string', help='the dir to store gather result, current dir by default.', default='./')
+        self.parser.add_option('-c', type='string', help='obdiag custom config', default=os.path.expanduser('~/.obdiag/config.yml'))
+
+    def init(self, cmd, args):
+        super(ObdiagAnalyzeVariableCommand, self).init(cmd, args)
+        self.parser.set_usage('%s [options]' % self.prev_cmd)
+        return self
+
+    def _do_command(self, obdiag):
+        return obdiag.analyze_fuction('analyze_variable', self.opts)
+
+
 class ObdiagCheckCommand(ObdiagOriginCommand):
 
     def __init__(self):
@@ -738,6 +825,8 @@ def __init__(self):
         self.register_command(ObdiagGatherObproxyLogCommand())
         self.register_command(ObdiagGatherSceneCommand())
         self.register_command(ObdiagGatherAshReportCommand())
+        self.register_command(ObdiagGatherParameterCommand())
+        self.register_command(ObdiagGatherVariableCommand())
 
 
 class ObdiagGatherSceneCommand(MajorCommand):
@@ -754,6 +843,8 @@ def __init__(self):
         super(ObdiagAnalyzeCommand, self).__init__('analyze', 'Analyze oceanbase diagnostic info')
         self.register_command(ObdiagAnalyzeLogCommand())
         self.register_command(ObdiagAnalyzeFltTraceCommand())
+        self.register_command(ObdiagAnalyzeParameterCommand())
+        self.register_command(ObdiagAnalyzeVariableCommand())
 
 
 class ObdiagRCACommand(MajorCommand):