hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

skip check_major_status in upgrade post stage

Browse Source
This commit is contained in:
yangqise7en
2023-08-01 23:48:00 +00:00
committed by ob-robot
parent c85cd26ce7
commit 405402f28a
6 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tools/upgrade/upgrade_post.py
View File

@ -570,7 +570,7 @@
#
# if run_modules.MODULE_HEALTH_CHECK in my_module_set:
# logging.info('================begin to run health check action ===============')
# upgrade_health_checker.do_check(my_host, my_port, my_user, my_passwd, upgrade_params, timeout)
# upgrade_health_checker.do_check(my_host, my_port, my_user, my_passwd, upgrade_params, timeout, False) # need_check_major_status = False
# logging.info('================succeed to run health check action ===============')
#
# if run_modules.MODULE_END_ROLLING_UPGRADE in my_module_set:
@ -756,7 +756,7 @@
#
# if run_modules.MODULE_HEALTH_CHECK in my_module_set:
# logging.info('================begin to run health check action ===============')
# upgrade_health_checker.do_check(my_host, my_port, my_user, my_passwd, upgrade_params, timeout)
# upgrade_health_checker.do_check(my_host, my_port, my_user, my_passwd, upgrade_params, timeout, True) # need_check_major_status = True
# logging.info('================succeed to run health check action ===============')
#
# except Exception, e:
@ -2554,7 +2554,7 @@
# time.sleep(10)
#
## 开始健康检查
#def do_check(my_host, my_port, my_user, my_passwd, upgrade_params, timeout, zone = ''):
#def do_check(my_host, my_port, my_user, my_passwd, upgrade_params, timeout, need_check_major_status, zone = ''):
# try:
# conn = mysql.connector.connect(user = my_user,
# password = my_passwd,
@ -2572,7 +2572,8 @@
# check_paxos_replica(query_cur, timeout)
# check_schema_status(query_cur, timeout)
# check_server_version_by_zone(query_cur, zone)
# check_major_merge(query_cur, timeout)
# if True == need_check_major_status:
# check_major_merge(query_cur, timeout)
# except Exception, e:
# logging.exception('run error')
# raise e
@ -2607,7 +2608,7 @@
# zone = get_opt_zone()
# logging.info('parameters from cmd: host=\"%s\", port=%s, user=\"%s\", password=\"%s\", log-file=\"%s\", timeout=%s, zone=\"%s\"', \
# host, port, user, password, log_filename, timeout, zone)
# do_check(host, port, user, password, upgrade_params, timeout, zone)
# do_check(host, port, user, password, upgrade_params, timeout, False, zone) # need_check_major_status = False
# except mysql.connector.Error, e:
# logging.exception('mysql connctor error')
# raise e