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

[UPGRADE] check standby tenant when needed

Browse Source
This commit is contained in:
tino247
2023-03-10 10:11:34 +00:00
committed by ob-robot
parent 3216191e05
commit 962180cc52
4 changed files with 195 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
tools/upgrade/upgrade_post_checker.py
View File

@ -18,11 +18,8 @@ def check_cluster_version(cur, timeout):
# 2 检查租户版本号
def check_data_version(cur, query_cur, timeout):
# check compatible
current_data_version = actions.get_current_data_version()
actions.wait_parameter_sync(cur, True, "compatible", current_data_version, 10)
# check target_data_version/current_data_version except standby tenant
# get tenant except standby tenant
sql = "select tenant_id from oceanbase.__all_tenant except select tenant_id from oceanbase.__all_virtual_tenant_info where tenant_role = 'STANDBY'"
(desc, results) = query_cur.exec_query(sql)
if len(results) == 0:
@ -33,6 +30,39 @@ def check_data_version(cur, query_cur, timeout):
for index, row in enumerate(results):
tenant_ids_str += """{0}{1}""".format((',' if index > 0 else ''), row[0])
# get server cnt
sql = "select count(*) from oceanbase.__all_server";
(desc, results) = query_cur.exec_query(sql)
if len(results) != 1 or len(results[0]) != 1:
logging.warn('result cnt not match')
raise e
server_count = results[0][0]
# check compatible sync
parameter_count = int(server_count) * int(tenant_count)
current_data_version = actions.get_current_data_version()
sql = """select count(*) as cnt from oceanbase.__all_virtual_tenant_parameter_info where name = 'compatible' and value = '{0}' and tenant_id in ({1})""".format(current_data_version, tenant_ids_str)
times = (timeout if timeout > 0 else 60) / 5
while times >= 0:
logging.info(sql)
cur.execute(sql)
result = cur.fetchall()
if len(result) != 1 or len(result[0]) != 1:
logging.exception('result cnt not match')
raise e
elif result[0][0] == parameter_count:
logging.info("""'compatible' is sync, value is {0}""".format(current_data_version))
break
else:
logging.info("""'compatible' is not sync, value should be {0}, expected_cnt should be {1}, current_cnt is {2}""".format(current_data_version, parameter_count, result[0][0]))
times -= 1
if times == -1:
logging.exception("""check compatible:{0} sync timeout""".format(current_data_version))
raise e
time.sleep(5)
# check target_data_version/current_data_version from __all_core_table
int_current_data_version = actions.get_version(current_data_version)
sql = "select count(*) from __all_virtual_core_table where column_name in ('target_data_version', 'current_data_version') and column_value = {0} and tenant_id in ({1})".format(int_current_data_version, tenant_ids_str)
(desc, results) = query_cur.exec_query(sql)