Merge branch 'dev_3.2.2' into 'master'

Dev 3.2.2

See merge request oceanbase/ob-deploy!460

Author: 雪染

_errno.py

@@ -170,7 +170,7 @@ class InitDirFailedErrorMessage(object):
 EC_OBSERVER_GET_MEMINFO_FAIL = OBDErrorCodeTemplate(2011, "{server}: fail to get memory info.\nPlease configure 'memory_limit' manually in configuration file")
 EC_OBSERVER_FAIL_TO_START_OCS = OBDErrorCodeTemplate(2012, 'Failed to start {server} obshell')
 EC_OBSERVER_UNKONE_SCENARIO = OBDErrorCodeTemplate(2013, 'Unknown scenario: {scenario}')
-EC_CPU_NOT_SUPPORT_AVX = OBDErrorCodeTemplate(2014, "{server}'s cpu not support avx")
+EC_CPU_NOT_SUPPORT_AVX = OBDErrorCodeTemplate(2014, "{server}'s cpu does not support avx")
 EC_OBSERVER_DISABLE_AUTOSTART = OBDErrorCodeTemplate(2015, "{server}: Failed to modify the configuration of the automatic startup. Please check whether the current user has sudo permissions")
 
 WC_OBSERVER_SYS_MEM_TOO_LARGE = OBDErrorCodeTemplate(2010, '({server}): system_memory too large. system_memory should be less than {factor} * memory_limit/memory_limit_percentage.')

plugins/oceanbase/3.1.0/environment_check.py

@@ -135,7 +135,8 @@ def environment_check(plugin_context, work_dir_empty_check=True, generate_config
                         err.EC_CONFLICT_PORT.format(server=ip, port=port),
                         [err.SUG_USE_OTHER_PORT.format()]
                     )
-        if not client.execute_command('lscpu | grep Flags | grep avx').stdout:
+
+        if len(re.findall(r'(^avx\s+)|(\s+avx\s+)|(\s+avx$)', client.execute_command('lscpu | grep avx').stdout)) == 0 and os.uname()[4].startswith('x86'):
             critical(server, 'cpu', err.EC_CPU_NOT_SUPPORT_AVX.format(server=server), [err.SUG_CHANGE_SERVER.format()])
     if success:
         for ip in servers_net_interface:

plugins/oceanbase/4.0.0.0/environment_check.py

@@ -134,8 +134,7 @@ def environment_check(plugin_context, work_dir_empty_check=True, generate_config
                         err.EC_CONFLICT_PORT.format(server=ip, port=port),
                         [err.SUG_USE_OTHER_PORT.format()]
                     )
-
-        if not client.execute_command('lscpu | grep Flags | grep avx').stdout:
+        if len(re.findall(r'(^avx\s+)|(\s+avx\s+)|(\s+avx$)', client.execute_command('lscpu | grep avx').stdout)) == 0 and os.uname()[4].startswith('x86'):
             critical(server, 'cpu', err.EC_CPU_NOT_SUPPORT_AVX.format(server=server), [err.SUG_CHANGE_SERVER.format()])
     if success:
         for ip in servers_net_interface:

plugins/oceanbase/4.2.0.0/environment_check.py

@@ -134,7 +134,7 @@ def environment_check(plugin_context, work_dir_empty_check=True, generate_config
                         err.EC_CONFLICT_PORT.format(server=ip, port=port),
                         [err.SUG_USE_OTHER_PORT.format()]
                     )
-        if not client.execute_command('lscpu | grep Flags | grep avx').stdout:
+        if len(re.findall(r'(^avx\s+)|(\s+avx\s+)|(\s+avx$)', client.execute_command('lscpu | grep avx').stdout)) == 0 and os.uname()[4].startswith('x86'):
             critical(server, 'cpu', err.EC_CPU_NOT_SUPPORT_AVX.format(server=server), [err.SUG_CHANGE_SERVER.format()])
     if success:
         for ip in servers_net_interface: