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

[CP] [CP] fix upgrade script

Browse Source
This commit is contained in:
chaser-ch
2023-07-11 19:47:53 +00:00
committed by ob-robot
parent 5f18f4b6f5
commit b9e66351c9
4 changed files with 36 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/upgrade/upgrade_checker.py
View File

@ -401,7 +401,7 @@ def check_cluster_status(query_cur):
(desc, results) = query_cur.exec_query("""select count(1) from CDB_OB_MAJOR_COMPACTION where (GLOBAL_BROADCAST_SCN > LAST_SCN or STATUS != 'IDLE')""") (desc, results) = query_cur.exec_query("""select count(1) from CDB_OB_MAJOR_COMPACTION where (GLOBAL_BROADCAST_SCN > LAST_SCN or STATUS != 'IDLE')""")
if results[0][0] > 0 : if results[0][0] > 0 :
fail_list.append('{0} tenant is merging, please check'.format(results[0][0])) fail_list.append('{0} tenant is merging, please check'.format(results[0][0]))
(desc, results) = query_cur.exec_query("""select /*+ query_timeout(1000000000) */ count(1) from __all_virtual_tablet_compaction_info where max_received_scn != finished_scn and max_received_scn > 0""") (desc, results) = query_cur.exec_query("""select /*+ query_timeout(1000000000) */ count(1) from __all_virtual_tablet_compaction_info where max_received_scn > finished_scn and max_received_scn > 0""")
if results[0][0] > 0 : if results[0][0] > 0 :
fail_list.append('{0} tablet is merging, please check'.format(results[0][0])) fail_list.append('{0} tablet is merging, please check'.format(results[0][0]))
logging.info('check cluster status success') logging.info('check cluster status success')

15
tools/upgrade/upgrade_health_checker.py
View File

@ -324,10 +324,17 @@ def check_schema_status(query_cur, timeout):
# 4. check major finish # 4. check major finish
def check_major_merge(query_cur, timeout): def check_major_merge(query_cur, timeout):
sql = """select count(1) from CDB_OB_MAJOR_COMPACTION where (GLOBAL_BROADCAST_SCN > LAST_SCN or STATUS != 'IDLE')""" need_check = 0
check_until_timeout(query_cur, sql, 0, timeout) (desc, results) = query_cur.exec_query("""select distinct value from GV$OB_PARAMETERs where name = 'enable_major_freeze';""")
sql2 = """select /*+ query_timeout(1000000000) */ count(1) from __all_virtual_tablet_compaction_info where max_received_scn != finished_scn and max_received_scn > 0""" if len(results) != 1:
check_until_timeout(query_cur, sql2, 0, timeout) need_check = 1
elif results[0][0] != 'True':
need_check = 1
if need_check == 1:
sql = """select count(1) from CDB_OB_MAJOR_COMPACTION where (GLOBAL_BROADCAST_SCN > LAST_SCN or STATUS != 'IDLE')"""
check_until_timeout(query_cur, sql, 0, timeout)
sql2 = """select /*+ query_timeout(1000000000) */ count(1) from __all_virtual_tablet_compaction_info where max_received_scn > finished_scn and max_received_scn > 0"""
check_until_timeout(query_cur, sql2, 0, timeout)
def check_until_timeout(query_cur, sql, value, timeout): def check_until_timeout(query_cur, sql, value, timeout):
times = timeout / 10 times = timeout / 10

17
tools/upgrade/upgrade_post.py
View File

@ -1931,7 +1931,7 @@
# (desc, results) = query_cur.exec_query("""select count(1) from CDB_OB_MAJOR_COMPACTION where (GLOBAL_BROADCAST_SCN > LAST_SCN or STATUS != 'IDLE')""") # (desc, results) = query_cur.exec_query("""select count(1) from CDB_OB_MAJOR_COMPACTION where (GLOBAL_BROADCAST_SCN > LAST_SCN or STATUS != 'IDLE')""")
# if results[0][0] > 0 : # if results[0][0] > 0 :
# fail_list.append('{0} tenant is merging, please check'.format(results[0][0])) # fail_list.append('{0} tenant is merging, please check'.format(results[0][0]))
# (desc, results) = query_cur.exec_query("""select /*+ query_timeout(1000000000) */ count(1) from __all_virtual_tablet_compaction_info where max_received_scn != finished_scn and max_received_scn > 0""") # (desc, results) = query_cur.exec_query("""select /*+ query_timeout(1000000000) */ count(1) from __all_virtual_tablet_compaction_info where max_received_scn > finished_scn and max_received_scn > 0""")
# if results[0][0] > 0 : # if results[0][0] > 0 :
# fail_list.append('{0} tablet is merging, please check'.format(results[0][0])) # fail_list.append('{0} tablet is merging, please check'.format(results[0][0]))
# logging.info('check cluster status success') # logging.info('check cluster status success')
@ -2522,10 +2522,17 @@
# #
## 4. check major finish ## 4. check major finish
#def check_major_merge(query_cur, timeout): #def check_major_merge(query_cur, timeout):
# sql = """select count(1) from CDB_OB_MAJOR_COMPACTION where (GLOBAL_BROADCAST_SCN > LAST_SCN or STATUS != 'IDLE')""" # need_check = 0
# check_until_timeout(query_cur, sql, 0, timeout) # (desc, results) = query_cur.exec_query("""select distinct value from GV$OB_PARAMETERs where name = 'enable_major_freeze';""")
# sql2 = """select /*+ query_timeout(1000000000) */ count(1) from __all_virtual_tablet_compaction_info where max_received_scn != finished_scn and max_received_scn > 0""" # if len(results) != 1:
# check_until_timeout(query_cur, sql2, 0, timeout) # need_check = 1
# elif results[0][0] != 'True':
# need_check = 1
# if need_check == 1:
# sql = """select count(1) from CDB_OB_MAJOR_COMPACTION where (GLOBAL_BROADCAST_SCN > LAST_SCN or STATUS != 'IDLE')"""
# check_until_timeout(query_cur, sql, 0, timeout)
# sql2 = """select /*+ query_timeout(1000000000) */ count(1) from __all_virtual_tablet_compaction_info where max_received_scn > finished_scn and max_received_scn > 0"""
# check_until_timeout(query_cur, sql2, 0, timeout)
# #
#def check_until_timeout(query_cur, sql, value, timeout): #def check_until_timeout(query_cur, sql, value, timeout):
# times = timeout / 10 # times = timeout / 10

17
tools/upgrade/upgrade_pre.py
View File

@ -1931,7 +1931,7 @@
# (desc, results) = query_cur.exec_query("""select count(1) from CDB_OB_MAJOR_COMPACTION where (GLOBAL_BROADCAST_SCN > LAST_SCN or STATUS != 'IDLE')""") # (desc, results) = query_cur.exec_query("""select count(1) from CDB_OB_MAJOR_COMPACTION where (GLOBAL_BROADCAST_SCN > LAST_SCN or STATUS != 'IDLE')""")
# if results[0][0] > 0 : # if results[0][0] > 0 :
# fail_list.append('{0} tenant is merging, please check'.format(results[0][0])) # fail_list.append('{0} tenant is merging, please check'.format(results[0][0]))
# (desc, results) = query_cur.exec_query("""select /*+ query_timeout(1000000000) */ count(1) from __all_virtual_tablet_compaction_info where max_received_scn != finished_scn and max_received_scn > 0""") # (desc, results) = query_cur.exec_query("""select /*+ query_timeout(1000000000) */ count(1) from __all_virtual_tablet_compaction_info where max_received_scn > finished_scn and max_received_scn > 0""")
# if results[0][0] > 0 : # if results[0][0] > 0 :
# fail_list.append('{0} tablet is merging, please check'.format(results[0][0])) # fail_list.append('{0} tablet is merging, please check'.format(results[0][0]))
# logging.info('check cluster status success') # logging.info('check cluster status success')
@ -2522,10 +2522,17 @@
# #
## 4. check major finish ## 4. check major finish
#def check_major_merge(query_cur, timeout): #def check_major_merge(query_cur, timeout):
# sql = """select count(1) from CDB_OB_MAJOR_COMPACTION where (GLOBAL_BROADCAST_SCN > LAST_SCN or STATUS != 'IDLE')""" # need_check = 0
# check_until_timeout(query_cur, sql, 0, timeout) # (desc, results) = query_cur.exec_query("""select distinct value from GV$OB_PARAMETERs where name = 'enable_major_freeze';""")
# sql2 = """select /*+ query_timeout(1000000000) */ count(1) from __all_virtual_tablet_compaction_info where max_received_scn != finished_scn and max_received_scn > 0""" # if len(results) != 1:
# check_until_timeout(query_cur, sql2, 0, timeout) # need_check = 1
# elif results[0][0] != 'True':
# need_check = 1
# if need_check == 1:
# sql = """select count(1) from CDB_OB_MAJOR_COMPACTION where (GLOBAL_BROADCAST_SCN > LAST_SCN or STATUS != 'IDLE')"""
# check_until_timeout(query_cur, sql, 0, timeout)
# sql2 = """select /*+ query_timeout(1000000000) */ count(1) from __all_virtual_tablet_compaction_info where max_received_scn > finished_scn and max_received_scn > 0"""
# check_until_timeout(query_cur, sql2, 0, timeout)
# #
#def check_until_timeout(query_cur, sql, value, timeout): #def check_until_timeout(query_cur, sql, value, timeout):
# times = timeout / 10 # times = timeout / 10