diff --git a/src/storage/compaction/ob_medium_compaction_mgr.h b/src/storage/compaction/ob_medium_compaction_mgr.h index 9ecdde0e25..59a05899b6 100644 --- a/src/storage/compaction/ob_medium_compaction_mgr.h +++ b/src/storage/compaction/ob_medium_compaction_mgr.h @@ -117,7 +117,7 @@ public: // check status on serialized medium list OB_INLINE bool could_schedule_next_round() const { - return !wait_check_flag_ && medium_info_list_.is_empty(); + return get_wait_check_medium_scn() == 0 && medium_info_list_.is_empty(); } const ObMediumCompactionInfo *get_next_schedule_medium_info(const int64_t last_major_snapshot) const; OB_INLINE ObMediumCompactionInfo::ObCompactionType get_last_compaction_type() const diff --git a/tools/upgrade/do_upgrade_post.py b/tools/upgrade/do_upgrade_post.py index bbba3b6641..4daa8658fc 100755 --- a/tools/upgrade/do_upgrade_post.py +++ b/tools/upgrade/do_upgrade_post.py @@ -65,7 +65,7 @@ def do_upgrade(my_host, my_port, my_user, my_passwd, timeout, my_module_set, upg 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: diff --git a/tools/upgrade/do_upgrade_pre.py b/tools/upgrade/do_upgrade_pre.py index 3418ee49d1..3f25020a5e 100755 --- a/tools/upgrade/do_upgrade_pre.py +++ b/tools/upgrade/do_upgrade_pre.py @@ -87,7 +87,7 @@ def do_upgrade(my_host, my_port, my_user, my_passwd, timeout, my_module_set, upg 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: diff --git a/tools/upgrade/upgrade_health_checker.py b/tools/upgrade/upgrade_health_checker.py index 8851bddd46..5f8eeb47ec 100755 --- a/tools/upgrade/upgrade_health_checker.py +++ b/tools/upgrade/upgrade_health_checker.py @@ -356,7 +356,7 @@ def check_until_timeout(query_cur, sql, value, timeout): 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, @@ -374,7 +374,8 @@ def do_check(my_host, my_port, my_user, my_passwd, upgrade_params, timeout, zone 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 @@ -409,7 +410,7 @@ if __name__ == '__main__': 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 diff --git a/tools/upgrade/upgrade_post.py b/tools/upgrade/upgrade_post.py index fcf5b56b57..8e183d601a 100755 --- a/tools/upgrade/upgrade_post.py +++ b/tools/upgrade/upgrade_post.py @@ -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 diff --git a/tools/upgrade/upgrade_pre.py b/tools/upgrade/upgrade_pre.py index ee2cad0c9e..776df69b69 100755 --- a/tools/upgrade/upgrade_pre.py +++ b/tools/upgrade/upgrade_pre.py @@ -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