v4.0.0

Author: gys-git

_cmd.py

@@ -308,7 +308,8 @@ def do_command(self):
             obd.set_cmds(self.cmds)
             ret = self._do_command(obd)
             if not ret:
-                ROOT_IO.exit_msg = DOC_LINK_MSG + "\n" + ROOT_IO.exit_msg
+                from _errno import EXIST_ERROR_CODE
+                ROOT_IO.exit_msg = ((DOC_LINK_MSG + "\n") if EXIST_ERROR_CODE else '') + ROOT_IO.exit_msg
         except NotImplementedError:
             ROOT_IO.exception('command \'%s\' is not implemented' % self.prev_cmd)
         except LockError:
@@ -839,7 +840,7 @@ def _do_command(self, obd):
 class DemoCommand(ClusterMirrorCommand):
 
     def __init__(self):
-        super(DemoCommand, self).__init__('demo', 'Quickly start')
+        super(DemoCommand, self).__init__('demo', 'Quickly start, This is a basic setup with minimal resources.')
         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 demo -c oceanbase-ce --oceanbase-ce.version=3.2.3\n"
          + "start oceanbase-ce and obproxy-ce: obd demo -c oceanbase-ce,obproxy-ce", default='oceanbase-ce,obproxy-ce,obagent,prometheus,grafana')
@@ -866,10 +867,10 @@ def _do_command(self, obd):
 class PrefCommand(ClusterMirrorCommand):
 
     def __init__(self):
-        super(PrefCommand, self).__init__('pref', 'Quickly start')
+        super(PrefCommand, self).__init__('perf', 'Quickly start, This deploys OceanBase with production-optimized configuration for enhanced performance.')
         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')
+         + "start -c oceanbase-ce V3.2.3: obd perf -c oceanbase-ce --oceanbase-ce.version=3.2.3\n"
+         + "start oceanbase-ce and obproxy-ce: obd perf -c oceanbase-ce,obproxy-ce", default='oceanbase-ce,obproxy-ce,obagent,prometheus,grafana')
         self.parser.allow_undefine = True
         self.parser.undefine_warn = False
 
@@ -885,8 +886,8 @@ def _do_command(self, obd):
         setattr(self.opts, 'max', True)
         obd.set_options(self.opts)
 
-        res = obd.demo(name='pref')
-        self.background_telemetry_task(obd, 'pref')
+        res = obd.demo(name='perf')
+        self.background_telemetry_task(obd, 'perf')
         return res
 
 
@@ -1090,6 +1091,20 @@ def _do_command(self, obd):
             return self._show_help()
 
 
+class ClusterPruneConfigCommand(ClusterMirrorCommand):
+
+    def __init__(self):
+        super(ClusterPruneConfigCommand, self).__init__('prune-config', 'Remove configuration files for destroyed or configured clusters.')
+        self.parser.add_option('--confirm', action='store_true', help='Confirm to prune configuration files.')
+
+    def _do_command(self, obd):
+        if self.cmds:
+            res = obd.prune_config(self.cmds[0], need_confirm=not getattr(self.opts, 'confirm', False))
+            return res
+        else:
+            return self._show_help()
+
+
 class ClusterDisplayCommand(ClusterMirrorCommand):
 
     def __init__(self):
@@ -1204,6 +1219,8 @@ def __init__(self):
         super(CLusterUpgradeCommand, self).__init__('upgrade', 'Upgrade a cluster.')
         self.parser.add_option('-c', '--component', type='string', help="Component name to upgrade.")
         self.parser.add_option('-V', '--version', type='string', help="Target version.")
+        self.parser.add_option('--tag', type='string', help="Docker component tag.")
+        self.parser.add_option('-i', '--image-name', type='string', help="Docker component image name.")
         self.parser.add_option('--skip-check', action='store_true', help="Skip all the possible checks.")
         self.parser.add_option('--usable', type='string', help="Hash list for priority mirrors, separated with `,`.", default='')
         self.parser.add_option('--disable', type='string', help="Hash list for disabled mirrors, separated with `,`.", default='')
@@ -1212,8 +1229,12 @@ def __init__(self):
         self.parser.add_option('--ignore-standby', '--igs', action='store_true', help="Force upgrade, before upgrade standby tenant`s cluster.")
 
     def _do_command(self, obd):
+        oms_upgrade_mode = None
+        if len(self.cmds) == 2 and self.cmds[1] in ['offline', 'online']:
+            oms_upgrade_mode = self.cmds[1]
+            del self.cmds[1]
         if self.cmds:
-            res = obd.upgrade_cluster(self.cmds[0])
+            res = obd.upgrade_cluster(self.cmds[0], oms_upgrade_mode)
             self.background_telemetry_task(obd)
             return res
         else:
@@ -1632,6 +1653,7 @@ def __init__(self):
         self.register_command(ClusterStartCommand())
         self.register_command(ClusterStopCommand())
         self.register_command(ClusterDestroyCommand())
+        self.register_command(ClusterPruneConfigCommand())
         self.register_command(ClusterDisplayCommand())
         self.register_command(ClusterListCommand())
         self.register_command(ClusterRestartCommand())
@@ -2875,6 +2897,127 @@ def _do_command(self, obd):
             return self._show_help()
 
 
+class SeekdbMirrorCommand(ObdCommand):
+
+    def init(self, cmd, args, need_deploy_name=True):
+        super(SeekdbMirrorCommand, self).init(cmd, args)
+        if need_deploy_name and not self.cmds:
+            return self._show_help()
+        return self
+
+
+class SeekdbDeployCommand(SeekdbMirrorCommand):
+
+    def __init__(self):
+        super(SeekdbDeployCommand, self).__init__('deploy', 'Deploy a seekdb cluster.')
+        self.parser.add_option('-f', '--force', action='store_true', help="Force deploy, clear the working directory.")
+        self.parser.add_option('-C', '--clean', action='store_true', help="Clean deploy, clear the working directory if it belongs to the current user.")
+        self.parser.add_option('-U', '--ulp', '--unuselibrepo', action='store_true', help="Disable automatic dependency handling.")
+        self.parser.add_option('-A', '--act', '--auto-create-tenant', action='store_true', help="Auto create tenant during bootstrap.")
+
+    def _do_command(self, obd):
+        if self.cmds:
+            obd.set_options(self.opts)
+            res = obd.deploy_cluster(self.cmds[0])
+            self.background_telemetry_task(obd)
+            return res
+        else:
+            return self._show_help()
+
+
+class SeekdbStartCommand(SeekdbMirrorCommand):
+
+    def __init__(self):
+        super(SeekdbStartCommand, self).__init__('start', 'Start a deployed seekdb cluster.')
+        self.parser.add_option('-s', '--servers', type='string', help="List of servers to be started. Multiple servers are separated with commas.")
+        self.parser.add_option('-S', '--strict-check', action='store_true', help="Throw errors instead of warnings when check fails.")
+        self.parser.add_option('--without-parameter', '--wop', action='store_true', help='Start without parameters.')
+
+    def _do_command(self, obd):
+        if self.cmds:
+            obd.set_cmds(self.cmds[1:])
+            res = obd.start_cluster(self.cmds[0])
+            self.background_telemetry_task(obd)
+            return res
+        else:
+            return self._show_help()
+
+
+class SeekdbStopCommand(SeekdbMirrorCommand):
+
+    def __init__(self):
+        super(SeekdbStopCommand, self).__init__('stop', 'Stop a started seekdb cluster.')
+        self.parser.add_option('-s', '--servers', type='string', help="List of servers to be stopped. Multiple servers are separated with commas.")
+
+    def _do_command(self, obd):
+        if self.cmds:
+            obd.set_cmds(self.cmds[1:])
+            res = obd.stop_cluster(self.cmds[0])
+            self.background_telemetry_task(obd)
+            return res
+        else:
+            return self._show_help()
+
+
+class SeekdbRestartCommand(SeekdbMirrorCommand):
+
+    def __init__(self):
+        super(SeekdbRestartCommand, self).__init__('restart', 'Restart a started seekdb cluster.')
+        self.parser.add_option('-s', '--servers', type='string', help="List of servers to be restarted. Multiple servers are separated with commas.")
+        self.parser.add_option('--with-parameter', '--wp', action='store_true', help='Restart with parameters.')
+
+    def _do_command(self, obd):
+        if self.cmds:
+            if not getattr(self.opts, 'with_parameter', False):
+                setattr(self.opts, 'without_parameter', True)
+            obd.set_options(self.opts)
+            res = obd.restart_cluster(self.cmds[0])
+            self.background_telemetry_task(obd)
+            return res
+        else:
+            return self._show_help()
+
+
+class SeekdbDestroyCommand(SeekdbMirrorCommand):
+
+    def __init__(self):
+        super(SeekdbDestroyCommand, self).__init__('destroy', 'Destroy a deployed seekdb cluster.')
+        self.parser.add_option('-f', '--force-kill', action='store_true', help="Force kill the running seekdb process in the working directory.")
+        self.parser.add_option('--confirm', action='store_true', help='Confirm to destroy.')
+
+    def _do_command(self, obd):
+        if self.cmds:
+            res = obd.destroy_cluster(self.cmds[0], need_confirm=not getattr(self.opts, 'confirm', False))
+            return res
+        else:
+            return self._show_help()
+
+
+class SeekdbDisplayCommand(SeekdbMirrorCommand):
+
+    def __init__(self):
+        super(SeekdbDisplayCommand, self).__init__('display', 'Display the information for a seekdb cluster.')
+        self.parser.add_option('--encryption-passkey', '--epk', type='string', help="Encryption passkey.")
+
+    def _do_command(self, obd):
+        if self.cmds:
+            return obd.display_cluster(self.cmds[0])
+        else:
+            return self._show_help()
+
+
+class SeekdbMajorCommand(MajorCommand):
+
+    def __init__(self):
+        super(SeekdbMajorCommand, self).__init__('seekdb', 'Deploy and manage a seekdb cluster.')
+        self.register_command(SeekdbDeployCommand())
+        self.register_command(SeekdbStartCommand())
+        self.register_command(SeekdbStopCommand())
+        self.register_command(SeekdbRestartCommand())
+        self.register_command(SeekdbDestroyCommand())
+        self.register_command(SeekdbDisplayCommand())
+
+
 class MainCommand(MajorCommand):
 
     def __init__(self):
@@ -2885,6 +3028,7 @@ def __init__(self):
         self.register_command(WebCommand())
         self.register_command(MirrorMajorCommand())
         self.register_command(ClusterMajorCommand())
+        self.register_command(SeekdbMajorCommand())
         self.register_command(RepositoryMajorCommand())
         self.register_command(TestMajorCommand())
         self.register_command(UpdateCommand())

_deploy.py

@@ -29,6 +29,7 @@
 
 import _errno as err
 import const
+from _rpm import Version
 from tool import ConfigUtil, FileUtil, YamlLoader, OrderedDict, COMMAND_ENV, aes_encrypt, aes_decrypt, \
     string_to_md5_32bytes
 from _manager import Manager
@@ -372,7 +373,9 @@ def _to_cluster_config(cls, component_name, conf, added_servers=None):
             ConfigUtil.get_value_from_dict(conf, 'version', None, str),
             ConfigUtil.get_value_from_dict(conf, 'tag', None, str),
             ConfigUtil.get_value_from_dict(conf, 'release', None, str),
-            ConfigUtil.get_value_from_dict(conf, 'package_hash', None, str)
+            ConfigUtil.get_value_from_dict(conf, 'package_hash', None, str),
+            ConfigUtil.get_value_from_dict(conf, 'type', 'rpm', str),
+            ConfigUtil.get_value_from_dict(conf, 'image_name', 'None', str)
         )
         if added_servers:
             cluster_config.added_servers = added_servers
@@ -478,14 +481,17 @@ def _from_cluster_config(cls, conf, cluster_config):
 
 class ClusterConfig(object):
 
-    def __init__(self, servers, name, version, tag, release, package_hash, parser=None):
+    def __init__(self, servers, name, version, tag, release, package_hash, comp_type, image_name, parser=None):
+        version = Version('1.0.0') if comp_type == 'docker' else version
         self._version = version
         self.origin_version = version
         self.tag = tag
+        self.comp_type = comp_type
         self.origin_tag = tag
         self._release = release
         self.origin_release = release
         self.name = name
+        self.image_name = image_name
         self.origin_package_hash = package_hash
         self._package_hash = package_hash
         self._temp_conf = {}
@@ -562,7 +568,7 @@ def __eq__(self, other):
         return True
 
     def __deepcopy__(self, memo):
-        cluster_config = self.__class__(deepcopy(self.servers), self.name, self.version, self.tag, self.release, self.package_hash, self.parser)
+        cluster_config = self.__class__(deepcopy(self.servers), self.name, self.version, self.tag, self.release, self.package_hash, self.image_name, self.parser)
         copy_attrs = ['origin_tag', 'origin_version', 'origin_package_hash', 'parser', 'added_servers']
         deepcopy_attrs = ['_temp_conf', '_all_default_conf', '_default_conf', '_global_conf', '_server_conf', '_cache_server', '_original_global_conf', '_depends', '_original_servers', '_inner_config']
         for attr in copy_attrs:
@@ -585,6 +591,10 @@ def set_base_dir(self, base_dir):
             self._include_config = None
             self._global_conf = None
 
+    @property
+    def docker_install(self):
+        return self.comp_type == 'docker'
+
     @property
     def deploy_name(self):
         return self._deploy_config.name
@@ -784,6 +794,16 @@ def get_need_redeploy_items(self, server):
                 items[key] = config[key]
         return items
 
+    def get_read_only_items(self, server):
+        if server not in self._server_conf:
+            return None
+        items = {}
+        config = self.get_server_conf(server)
+        for key in config:
+            if key in self._temp_conf and self._temp_conf[key].read_only:
+                items[key] = config[key]
+        return items
+
     def get_need_restart_items(self, server):
         if server not in self._server_conf:
             return None
@@ -1244,7 +1264,9 @@ def update_component_info(self, repository):
             src_data['version'] = repository.version
         if 'release' in src_data:
             src_data['release'] = repository.release
-        if 'tag' in src_data:
+        if src_data.get('type') == 'docker':
+            src_data['tag'] = repository.version
+        elif 'tag' in src_data:
             del src_data['tag']
 
         self._src_data[component] = src_data
@@ -1693,6 +1715,11 @@ def update_password_in_global_config(self, global_config, path, key, enable_encr
                 self.update_password_in_global_config(global_config[current_key], path[1:], key, enable_encrypt)
 
     def change_deploy_config_password(self, enable_encrypt, change_deploy_encrypt=True, first_encrypt=False):
+        class ExcludePassword:
+            def __init__(self, ob_param: str, comps: list):
+                self.ob_param = ob_param
+                self.comps = comps
+
         if COMMAND_ENV.get(const.ENCRYPT_PASSWORD) != '1' and not first_encrypt:
             return True
         deploy_encrypt_enable = self.inner_config.get_global_config(const.ENCRYPT_PASSWORD) or False
@@ -1701,12 +1728,13 @@ def change_deploy_config_password(self, enable_encrypt, change_deploy_encrypt=Tr
         if not enable_encrypt and not self._config_encrypted:
             self._need_encrypt_dump = False
         else:
-
+            ob_global_config = {}
             cluster_id = ''
             for component in const.COMPS_OB:
                 if component in self.components.keys():
                     cluster_config = self.components[component]
                     global_config = cluster_config.get_global_conf()
+                    ob_global_config = global_config
                     cluster_id = str(global_config['cluster_id']) if 'cluster_id' in global_config else ''
             key = string_to_md5_32bytes(self.name + cluster_id).encode('utf-8')
             self.stdio.verbose(f"encrypt key: {key}")
@@ -1715,13 +1743,19 @@ def change_deploy_config_password(self, enable_encrypt, change_deploy_encrypt=Tr
                     self.user.password = aes_encrypt(str(self.user.password), key)
                 else:
                     self.user.password = aes_decrypt(self.user.password, key)
+
+            exclude_pwd = {"ocp_meta_password": ExcludePassword("ocp_meta_password", const.COMPS_OCP)}
             for component, cluster_config in self.components.items():
                 self.stdio.verbose(f"change {component} pwd encrypt.")
                 password_paths = []
                 global_config = cluster_config.get_global_conf()
                 self.get_all_password_path(global_config, password_paths, component)
                 change_global_config = deepcopy(global_config)
                 for password_path in password_paths:
+                    if password_path in exclude_pwd and component in exclude_pwd[password_path].comps:
+                        origin_global_config = cluster_config.get_original_global_conf()
+                        if ob_global_config.get(exclude_pwd[password_path].ob_param) and not origin_global_config.get(password_path):
+                            continue
                     password_path_keys = password_path.split('.')
                     self.update_password_in_global_config(change_global_config, password_path_keys, key, enable_encrypt)
                     cluster_config.update_global_conf(password_path_keys[0], change_global_config[password_path_keys[0]], save=False)