Dev 3.4.0

Author: gys-git

_cmd.py

@@ -740,9 +740,12 @@ def __init__(self):
 
 class ClusterMirrorCommand(ObdCommand):
 
-    def init(self, cmd, args):
+    def init(self, cmd, args, need_deploy_name=True):
         super(ClusterMirrorCommand, self).init(cmd, args)
-        self.parser.set_usage('%s <deploy name> [options]' % self.prev_cmd)
+        usage = '%s <deploy name> [options]'
+        if not need_deploy_name:
+            usage = '%s [options]'
+        self.parser.set_usage(usage % self.prev_cmd)
         return self
 
     def get_obd_namespaces_data(self, obd):
@@ -837,6 +840,10 @@ def __init__(self):
         self.parser.allow_undefine = True
         self.parser.undefine_warn = False
 
+    def init(self, cmd, args, need_deploy_name=False):
+        super(DemoCommand, self).init(cmd, args, need_deploy_name)
+        return self
+
     def _do_command(self, obd):
         setattr(self.opts, 'force', True)
         setattr(self.opts, 'clean', True)
@@ -849,6 +856,33 @@ def _do_command(self, obd):
         return res
 
 
+class PrefCommand(ClusterMirrorCommand):
+
+    def __init__(self):
+        super(PrefCommand, self).__init__('pref', 'Quickly start')
+        self.parser.add_option('-c', '--components', type='string', help="List the components. Multiple components are separated with commas. [oceanbase-ce,obproxy-ce,obagent,prometheus,grafana,ob-configserver]\nExample: \nstart oceanbase-ce: obd demo -c oceanbase-ce\n"
+         + "start -c oceanbase-ce V3.2.3: obd pref -c oceanbase-ce --oceanbase-ce.version=3.2.3\n"
+         + "start oceanbase-ce and obproxy-ce: obd pref -c oceanbase-ce,obproxy-ce", default='oceanbase-ce,obproxy-ce,obagent,prometheus,grafana')
+        self.parser.allow_undefine = True
+        self.parser.undefine_warn = False
+
+    def init(self, cmd, args, need_deploy_name=False):
+        super(PrefCommand, self).init(cmd, args, need_deploy_name)
+        return self
+
+    def _do_command(self, obd):
+        setattr(self.opts, 'force', True)
+        setattr(self.opts, 'clean', True)
+        setattr(self.opts, 'force', True)
+        setattr(self.opts, 'force_delete', True)
+        setattr(self.opts, 'max', True)
+        obd.set_options(self.opts)
+
+        res = obd.demo(name='pref')
+        self.background_telemetry_task(obd, 'pref')
+        return res
+
+
 class WebCommand(ObdCommand):
 
     def __init__(self):
@@ -916,20 +950,25 @@ def __init__(self):
         self.parser.add_option('-C', '--clean', action='store_true', help="Clean the home path if the directory belong to you.", default=False)
         self.parser.add_option('-U', '--unuselibrepo', '--ulp', action='store_true', help="Disable OBD from installing the libs mirror automatically.")
         self.parser.add_option('-A', '--auto-create-tenant', '--act', action='store_true', help="Automatically create a tenant named `test` by using all the available resource of the cluster.")
+        self.parser.add_option('-i', '--interactive', action='store_true', help="Interactive deployment cluster, including deployment and startup.")
         # self.parser.add_option('-F', '--fuzzymatch', action='store_true', help="enable fuzzy match when search package")
 
     def _do_command(self, obd):
-        if self.cmds:
-            if getattr(self.opts, 'force', False) or getattr(self.opts, 'clean', False):
-                setattr(self.opts, 'skip_cluster_status_check', True)
-                obd.set_options(self.opts)
-            res = obd.deploy_cluster(self.cmds[0])
-            self.background_telemetry_task(obd)
-            if res and COMMAND_ENV.get(const.INTERACTIVE_INSTALL, '0') == '0':
-                obd.stdio.print(FormatText.success('Please execute ` obd cluster start %s ` to start' % self.cmds[0]))
-            return res
+        if getattr(self.opts, 'interactive'):
+            name = self.cmds[0] if self.cmds else ''
+            return obd.interactive_deploy(name)
         else:
-            return self._show_help()
+            if self.cmds:
+                if getattr(self.opts, 'force', False) or getattr(self.opts, 'clean', False):
+                    setattr(self.opts, 'skip_cluster_status_check', True)
+                    obd.set_options(self.opts)
+                res = obd.deploy_cluster(self.cmds[0])
+                self.background_telemetry_task(obd)
+                if res and COMMAND_ENV.get(const.INTERACTIVE_INSTALL, '0') == '0':
+                    obd.stdio.print(FormatText.success('Please execute ` obd cluster start %s ` to start' % self.cmds[0]))
+                return res
+            else:
+                return self._show_help()
 
 
 class ClusterScaleoutCommand(ClusterMirrorCommand):
@@ -2803,6 +2842,7 @@ def __init__(self):
         super(MainCommand, self).__init__('obd', '')
         self.register_command(DevModeMajorCommand())
         self.register_command(DemoCommand())
+        self.register_command(PrefCommand())
         self.register_command(WebCommand())
         self.register_command(MirrorMajorCommand())
         self.register_command(ClusterMajorCommand())

_repository.py

@@ -424,6 +424,8 @@ def load_pkg(self, pkg, plugin):
                 ParallerExtractor(pkg, need_extract_files, stdio=self.stdio).extract()
 
                 for link in links:
+                    directory = os.path.dirname(link)
+                    os.makedirs(directory, exist_ok=True)
                     self.stdio and getattr(self.stdio, 'verbose', print)('link %s to %s' % (links[link], link))
                     os.symlink(links[link], link)
                 for n_dir in need_dirs:

_stdio.py

@@ -24,6 +24,7 @@
 import inspect2
 import six
 import logging
+import ast
 from copy import deepcopy
 from logging import handlers
 
@@ -698,11 +699,16 @@ def read(self, msg='', blocked=False):
                 self._print(MsgLevel.INFO, msg, end='')
         return self.get_input_stream().readline(not self.syncing and blocked)
 
-    def confirm(self, msg):
+    def confirm(self, msg, default_option=''):
         if self.default_confirm:
             self.verbose("%s and then auto confirm yes" % msg)
             return True
-        msg = '%s [y/n]: ' % msg
+        if default_option is False:
+            msg = '%s [y/n] [Default: n]: ' % msg
+        elif default_option is True:
+            msg = '%s [y/n] [Default: y]: ' % msg
+        else:
+            msg = '%s [y/n]: ' % msg
         self.print(msg, end='')
         if self.isatty() and not self.syncing:
             while True:
@@ -712,6 +718,10 @@ def confirm(self, msg):
                         return True
                     if ans == 'n':
                         return False
+                    if default_option is True:
+                        return True
+                    if default_option is False:
+                        return False
                 except Exception as e:
                     if not e:
                         return False
@@ -758,7 +768,7 @@ def _print(self, msg_lv, msg, *args, **kwargs):
                 print_msg = pattern.sub(replacement, print_msg)
         kwargs['file'] and print(self._format(print_msg, *args), **kwargs)
         del kwargs['file']
-        enaable_log and self.log(msg_lv, msg, *args, **kwargs)
+        enaable_log and self.log(msg_lv, print_msg, *args, **kwargs)
 
     def log(self, levelno, msg, *args, **kwargs):
         msg = self.log_masking(msg)
@@ -877,8 +887,11 @@ def contains_keys(msg):
                 passkey_pattern = re.compile(passkey_regex)
                 if passkey_pattern.search(msg):
                     return passkey_pattern.sub(r'\1******', msg)
+            
+            if "IDENTIFIED BY" in msg:
+                return desensitize_sql_pwd(msg)
 
-            pwd_args_regex = r"(IDENTIFIED BY \S+.*args:\s*\[['\"]?|_password \S+.*args:\s*\[['\"]?)([^\s'\"']+)(['\"]*)"
+            pwd_args_regex = r"(_password \S+.*args:\s*\[['\"]?)([^\s'\"']+)(['\"]*)"
             arg_pattern = re.compile(pwd_args_regex)
             if arg_pattern.search(msg):
                 return arg_pattern.sub(r"\1******\3", msg)
@@ -932,7 +945,10 @@ def log_masking(self, msg):
                 if passkey_pattern.search(msg):
                     return passkey_pattern.sub(r'\1******', msg)
 
-            pwd_args_regex = r"(IDENTIFIED BY \S+.*args:\s*\[['\"]?|_password \S+.*args:\s*\[['\"]?)([^\s'\"']+)(['\"]*)"
+            if "IDENTIFIED BY" in msg:
+                return desensitize_sql_pwd(msg)
+            
+            pwd_args_regex = r"(_password \S+.*args:\s*\[['\"]?)([^\s'\"']+)(['\"]*)"
             arg_pattern = re.compile(pwd_args_regex)
             if arg_pattern.search(msg):
                 return arg_pattern.sub(r"\1******\3", msg)
@@ -1101,6 +1117,32 @@ def func_wrapper(*args, **kwargs):
             return _type(func) if is_bond_method else func
     return decorated
 
+def desensitize_sql_pwd(sql_str):
+    if 'IDENTIFIED BY "' in sql_str:
+        pattern = r'(IDENTIFIED BY\s*)"[^"]*"'
+        replacement = r'\1"******"'
+        return re.sub(pattern, replacement, sql_str)
+    
+    if 'IDENTIFIED BY %s' in sql_str:
+        args_match = re.search(r'args:\s*(\[.*\])', sql_str)
+        if not args_match:
+            return sql_str
+            
+        try:
+            args_str = args_match.group(1)
+            args_list = ast.literal_eval(args_str)
+            identified_by_index = sql_str.index('IDENTIFIED BY %s')
+            prefix = sql_str[:identified_by_index]
+            placeholder_count = prefix.count('%s')
+            
+            if placeholder_count < len(args_list):
+                args_list[placeholder_count] = '******'
+                new_args_str = str(args_list)
+                return sql_str.replace(args_str, new_args_str)
+        except (SyntaxError, ValueError):
+            pass
+            
+    return sql_str
 
 class SafeStdioMeta(type):
 

_tool.py

@@ -19,7 +19,7 @@
 
 from _manager import Manager
 from _rpm import PackageInfo
-from _stdio import SafeStdio
+from _stdio import SafeStdio, FormatText
 from tool import YamlLoader, DirectoryUtil
 from const import COMP_OBCLIENT, COMP_OCEANBASE_DIAGNOSTIC_TOOL, COMP_OBDIAG, TOOL_TPCH, TOOL_TPCC, TOOL_SYSBENCH, COMP_JRE
 
@@ -229,4 +229,61 @@ def is_tool_install(self, name):
     def check_if_avaliable_update(self, tool, package):
         if package.version > tool.config.version:
             return True
-        return False
+        return False
+    
+    def ln_to_global(self, client, tool_path, tool_name, stdio):
+        link_name = f'/usr/local/bin/{tool_name}'
+        if client.config.username == 'root':
+            cmd = f'ln -s {tool_path} {link_name}'
+        else:
+            cmd = f'sudo ln -s {tool_path} {link_name}'
+        ret = client.execute_command(cmd, stdio=stdio)
+        return ret
+    
+    def unln_to_global(self, client, tool_name, stdio):
+        link_name = f'/usr/local/bin/{tool_name}'
+        if client.config.username == 'root':
+            cmd = f'unlink {link_name}'
+        else:
+            cmd = f'sudo -s unlink {link_name}'
+        return client.execute_command(cmd, stdio=stdio)
+
+    
+    def add_path_to_bash_profile(self, path, stdio):
+        home_dir = os.getenv('HOME')
+        bash_profile_path = os.path.join(home_dir, '.bash_profile')
+        with open(bash_profile_path, 'r') as file:
+            content = file.readlines()
+        path_exists = any(
+            f'PATH={x.strip()}'
+            for x in content 
+            if 'PATH=' in x and path in x
+        )
+        if not path_exists:
+            with open(bash_profile_path, 'a') as file:
+                file.write(f'\nexport PATH="$PATH:{path}"\n')
+            stdio.print(FormatText.info("Please source ~/.bash_profile to enable it"))
+
+    def remove_path_from_bash_profile(self, path):
+        home_dir = os.getenv('HOME')
+        bash_profile_path = os.path.join(home_dir, '.bash_profile')
+        with open(bash_profile_path, 'r') as file:
+            content = file.readlines()
+        
+        new_content = []
+        path_found = False
+        for line in content:
+            if line.startswith("export PATH="):
+                line = line.strip()
+                line_content = line.split('=', 1)[1].strip('"')
+                paths = line_content.split(':')
+                if path in paths:
+                    paths.remove(path)
+                    path_found = True
+                new_line = f'export PATH="{":".join(paths)}"\n'
+                new_content.append(new_line)
+            else:
+                new_content.append(line)
+        if path_found:
+            with open(bash_profile_path, 'w') as file:
+                file.writelines(new_content)

_types.py

@@ -237,7 +237,6 @@ def _format(self):
         if not self._origin:
             self.value = '0M'
 
-
 class StringList(ConfigItemType):
 
     def _format(self):