V2.1.0 (#170)

* V2.1.0

* V2.1.0 #163

Author: frf12

.gitignore

@@ -36,3 +36,4 @@ tags
 /web/src/.umi-production
 /web/src/.umi-test
 /web/.env.local
+/web/.must.config.js

_cmd.py

@@ -36,3 +36,9 @@
 ENV_DISABLE_RSYNC = "OBD_DISABLE_RSYNC"
 
 ENV_DISABLE_PARALLER_EXTRACT = "OBD_DISALBE_PARALLER_EXTRACT"
+
+# telemetry mode. 0 - disable, 1 - enable.
+TELEMETRY_MODE = "TELEMETRY_MODE"
+
+# telemetry log mode. 0 - disable, 1 - enable.
+TELEMETRY_LOG_MODE = "TELEMETRY_LOG_MODE"

_environ.py

@@ -174,9 +174,15 @@ class InitDirFailedErrorMessage(object):
 EC_OCP_EXPRESS_META_DB_NOT_ENOUGH_LOG_DISK_AVAILABLE = OBDErrorCodeTemplate(4305, 'There is not enough log disk for ocp meta tenant. (Avail: {avail}, Need: {need})')
 EC_OCP_EXPRESS_META_DB_NOT_ENOUGH_LOG_DISK = OBDErrorCodeTemplate(4305, 'There is not enough log disk for ocp meta tenant.')
 EC_OCP_EXPRESS_META_DB_NOT_ENOUGH_MEM = OBDErrorCodeTemplate(4305, 'There is not enough memory for ocp meta tenant')
+EC_OCP_EXPRESS_ADMIN_PASSWD_ERROR = OBDErrorCodeTemplate(4306, '({ip}) ocp-express admin_passwd invalid.(Current :{current})')
 # sql
 EC_SQL_EXECUTE_FAILED = OBDErrorCodeTemplate(5000, "{sql} execute failed")
 
+# obdiag
+EC_OBDIAG_NOT_FOUND = OBDErrorCodeTemplate(6000, 'Failed to executable obdiag command, you may not have obdiag installed')
+EC_OBDIAG_NOT_CONTAIN_DEPEND_COMPONENT = OBDErrorCodeTemplate(6001, 'obdiag must contain depend components {components}')
+EC_OBDIAG_OPTIONS_FORMAT_ERROR = OBDErrorCodeTemplate(6002, 'obdiag options {option} format error, please check the value : {value}')
+
 # WARN CODE 
 WC_ULIMIT_CHECK = OBDErrorCodeTemplate(1007, '({server}) The recommended number of {key} is {need} (Current value: {now})')
 WC_AIO_NOT_ENOUGH = OBDErrorCodeTemplate(1011, '({ip}) The recommended value of fs.aio-max-nr is 1048576 (Current value: {current})')
@@ -221,4 +227,5 @@ class InitDirFailedErrorMessage(object):
 SUG_OCP_EXPRESS_REDUCE_DISK = OBDErrorSuggestionTemplate('Please reduce the `logging_file_total_size_cap`', fix_eval=[FixEval(FixEval.DEL, 'logging_file_total_size_cap')])
 SUG_OCP_EXPRESS_COMP_VERSION = OBDErrorSuggestionTemplate('Please use {comp} with version {version} or above')
 SUG_OCP_EXPRESS_REDUCE_META_DB_MEM = OBDErrorSuggestionTemplate('Please reduce the `ocp_meta_tenant_memory_size`', fix_eval=[FixEval(FixEval.DEL, 'ocp_meta_tenant_memory_size')])
-SUG_OCP_EXPRESS_REDUCE_META_DB_LOG_DISK = OBDErrorSuggestionTemplate('Please reduce the `ocp_meta_tenant_log_disk_size`', fix_eval=[FixEval(FixEval.DEL, 'ocp_meta_tenant_log_disk_size')])
+SUG_OCP_EXPRESS_REDUCE_META_DB_LOG_DISK = OBDErrorSuggestionTemplate('Please reduce the `ocp_meta_tenant_log_disk_size`', fix_eval=[FixEval(FixEval.DEL, 'ocp_meta_tenant_log_disk_size')])
+SUG_OCP_EXPRESS_EDIT_ADMIN_PASSWD_ERROR = OBDErrorSuggestionTemplate('Please edit the `admin_passwd`, must be 8 to 32 characters in length, and must contain at least two digits, two uppercase letters, two lowercase letters, and two of the following special characters:~!@#%^&*_-+=|(){{}}[]:;,.?/)', fix_eval=[FixEval(FixEval.DEL, 'admin_passwd')], auto_fix=True)

_errno.py

@@ -23,6 +23,7 @@
 import os
 import re
 import sys
+import time
 from enum import Enum
 from glob import glob
 from copy import deepcopy, copy
@@ -78,8 +79,8 @@ def __init__(self, spacename):
     def variables(self):
         return self._variables
 
-    def get_variable(self, name):
-        return self._variables.get(name)
+    def get_variable(self, name, default=None):
+        return self._variables.get(name, default)
 
     def set_variable(self, name, value):
         self._variables[name] = value
@@ -177,12 +178,12 @@ def return_false(self, *args, **kwargs):
         self._return.return_false(*args, **kwargs)
         self.namespace.set_return(self.plugin_name, self._return)
 
-    def get_variable(self, name, spacename=None):
+    def get_variable(self, name, spacename=None, default=None):
         if spacename:
             namespace = self.namespaces.get(spacename)
         else:
             namespace = self.namespace
-        return namespace.get_variable(name) if namespace else None
+        return namespace.get_variable(name, default) if namespace else None
 
     def set_variable(self, name, value):
         self.namespace.set_variable(name, value)
@@ -270,8 +271,11 @@ def _new_func(
         self.before_do(self.name, namespace, namespaces, deploy_name,
         repositories, components, clients, cluster_config, cmd,
         options, stdio, *arg, **kwargs)
+        method_name = self.PLUGIN_NAME
+        run_result = self.context.get_variable('run_result', default={})
+        run_result[method_name] = {'result': True}
+        start_time = time.time()
         if self.module:
-            method_name = func.__name__
             method = getattr(self.module, method_name, False)
             namespace_vars = copy(self.context.namespace.variables)
             namespace_vars.update(kwargs)
@@ -280,10 +284,15 @@ def _new_func(
                 try:
                     ret = method(self.context, *arg, **kwargs)
                     if ret is None and self.context and self.context.get_return() is None:
+                        run_result[method_name]['result'] = False
                         self.context.return_false()
                 except Exception as e:
+                    run_result[method_name]['result'] = False
                     self.context.return_false(exception=e)
                     stdio and getattr(stdio, 'exception', print)('%s RuntimeError: %s' % (self, e))
+        end_time = time.time()
+        run_result[method_name]['time'] = end_time - start_time
+        self.context.set_variable('run_result', run_result)
         ret = self.context.get_return() if self.context else PluginReturn()
         self.after_do(stdio, *arg, **kwargs)
         return ret

_plugin.py

@@ -379,10 +379,9 @@ def __init__(self,
     ):
         self.level = level
         self.msg_lv = msg_lv
-        self.log_path = None
-        self.trace_id = None
-        self.log_name = 'default'
-        self.log_path = None
+        self._log_path = None
+        self._trace_id = None
+        self._log_name = 'default'
         self._trace_logger = None
         self._log_cache = [] if use_cache else None
         self._root_io = root_io
@@ -419,13 +418,18 @@ def set_output_stream(self, output_stream):
         self._output_is_tty = output_stream.isatty()
         return True
 
-    def init_trace_logger(self, log_path, log_name=None, trace_id=None):
-        if self._trace_logger is None:
-            self.log_path = log_path
-            if trace_id:
-                self.trace_id = trace_id
+    def init_trace_logger(self, log_path, log_name=None, trace_id=None, recreate=False):
+        if self._root_io:
+            return False
+        if self._trace_logger is None or recreate:
+            self._log_path = log_path
             if log_name:
-                self.log_name = log_name
+                self._log_name = log_name
+            if trace_id:
+                self._trace_id = trace_id
+            self._trace_logger = None
+            return True
+        return False
 
     def __getstate__(self):
         state = {}
@@ -437,6 +441,8 @@ def __getstate__(self):
 
     @property
     def trace_logger(self):
+        if self._root_io:
+            return self._root_io.trace_logger
         if self.log_path and self._trace_logger is None:
             self._trace_logger = Logger(self.log_name)
             handler = handlers.TimedRotatingFileHandler(self.log_path, when='midnight', interval=1, backupCount=30)
@@ -447,6 +453,24 @@ def trace_logger(self):
             self._trace_logger.addHandler(handler)
         return self._trace_logger
 
+    @property
+    def trace_id(self):
+        if self._root_io:
+            return self._root_io.trace_id
+        return self._trace_id
+
+    @property
+    def log_path(self):
+        if self._root_io:
+            return self._root_io.log_path
+        return self._log_path
+
+    @property
+    def log_name(self):
+        if self._root_io:
+            return self._root_io.log_name
+        return self._log_name
+
     @property
     def log_cache(self):
         if self._root_io:
@@ -618,10 +642,6 @@ def sub_io(self, pid=None, msg_lv=None):
                 track_limit=self.track_limit,
                 root_io=self._root_io if self._root_io else self
             )
-            sub_io.log_name = self.log_name
-            sub_io.log_path = self.log_path
-            sub_io.trace_id = self.trace_id
-            sub_io._trace_logger = self.trace_logger
             self.sub_ios[key] = sub_io
         return self.sub_ios[key]
 

_stdio.py

@@ -0,0 +1,42 @@
+# coding: utf-8
+# OceanBase Deploy.
+# Copyright (C) 2021 OceanBase
+#
+# This file is part of OceanBase Deploy.
+#
+# OceanBase Deploy is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# OceanBase Deploy is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with OceanBase Deploy.  If not, see <https://www.gnu.org/licenses/>.
+
+# OceanBase official website
+OB_OFFICIAL_WEBSITE = 'https://www.oceanbase.com/'
+
+# post telemetry data to OceanBase official
+TELEMETRY_URL = 'http://openwebapi.dev.alipay.net/api/web/oceanbase/report'
+
+# obdeploy version
+VERSION = '<VERSION>'
+# obdeploy build commit
+REVISION = '<CID>'
+# obdeploy build branch
+BUILD_BRANCH = '<B_BRANCH>'
+# obdeploy build time
+BUILD_TIME = '<B_TIME>'
+
+# obdeploy home path
+CONST_OBD_HOME = "OBD_HOME"
+# obdeploy install pre path
+CONST_OBD_INSTALL_PRE = "OBD_INSTALL_PRE"
+# obdeploy install path
+CONST_OBD_INSTALL_PATH = "OBD_INSTALL_PATH"
+# obdeploy forbidden variable
+FORBIDDEN_VARS = (CONST_OBD_HOME, CONST_OBD_INSTALL_PRE, CONST_OBD_INSTALL_PATH)