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

Hide passwords in upgrade scripts and fix compact_ce testcase

Browse Source
This commit is contained in:
obdev
2024-04-24 08:23:04 +00:00
committed by ob-robot
parent e36e4917bf
commit 5de554fc81
6 changed files with 147 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tools/upgrade/do_upgrade_post.py
View File

@ -14,6 +14,7 @@ import actions
import upgrade_health_checker
import tenant_upgrade_action
import upgrade_post_checker
import re
# 由于用了/*+read_consistency(WEAK) */来查询，因此升级期间不能允许创建或删除租户
@ -22,6 +23,11 @@ class UpgradeParams:
sql_dump_filename = config.post_upgrade_sql_filename
rollback_sql_filename = config.post_upgrade_rollback_sql_filename
class PasswordMaskingFormatter(logging.Formatter):
def format(self, record):
s = super(PasswordMaskingFormatter, self).format(record)
return re.sub(r'password=\".*?\"', 'password=\"******\"', s)
def config_logging_module(log_filenamme):
logging.basicConfig(level=logging.INFO,\
format='[%(asctime)s] %(levelname)s %(filename)s:%(lineno)d %(message)s',\
@ -29,15 +35,18 @@ def config_logging_module(log_filenamme):
filename=log_filenamme,\
filemode='w')
# 定义日志打印格式
formatter = logging.Formatter('[%(asctime)s] %(levelname)s %(filename)s:%(lineno)d %(message)s', '%Y-%m-%d %H:%M:%S')
formatter = PasswordMaskingFormatter('[%(asctime)s] %(levelname)s %(filename)s:%(lineno)d %(message)s', '%Y-%m-%d %H:%M:%S')
#######################################
# 定义一个Handler打印INFO及以上级别的日志到sys.stdout
stdout_handler = logging.StreamHandler(sys.stdout)
stdout_handler.setLevel(logging.INFO)
# 设置日志打印格式
stdout_handler.setFormatter(formatter)
# 将定义好的stdout_handler日志handler添加到root logger
# 定义一个Handler处理文件输出
file_handler = logging.FileHandler(log_filenamme, mode='w')
file_handler.setLevel(logging.INFO)
file_handler.setFormatter(formatter)
logging.getLogger('').addHandler(stdout_handler)
logging.getLogger('').addHandler(file_handler)
def print_stats():
logging.info('==================================================================================')

15
tools/upgrade/do_upgrade_pre.py
View File

@ -6,6 +6,7 @@ import sys
import mysql.connector
from mysql.connector import errorcode
import logging
import re
import config
import opts
@ -21,6 +22,11 @@ class UpgradeParams:
sql_dump_filename = config.pre_upgrade_sql_filename
rollback_sql_filename = config.pre_upgrade_rollback_sql_filename
class PasswordMaskingFormatter(logging.Formatter):
def format(self, record):
s = super(PasswordMaskingFormatter, self).format(record)
return re.sub(r'password=\".*?\"', 'password=\"******\"', s)
def config_logging_module(log_filenamme):
logging.basicConfig(level=logging.INFO,\
format='[%(asctime)s] %(levelname)s %(filename)s:%(lineno)d %(message)s',\
@ -28,15 +34,18 @@ def config_logging_module(log_filenamme):
filename=log_filenamme,\
filemode='w')
# 定义日志打印格式
formatter = logging.Formatter('[%(asctime)s] %(levelname)s %(filename)s:%(lineno)d %(message)s', '%Y-%m-%d %H:%M:%S')
formatter = PasswordMaskingFormatter('[%(asctime)s] %(levelname)s %(filename)s:%(lineno)d %(message)s', '%Y-%m-%d %H:%M:%S')
#######################################
# 定义一个Handler打印INFO及以上级别的日志到sys.stdout
stdout_handler = logging.StreamHandler(sys.stdout)
stdout_handler.setLevel(logging.INFO)
# 设置日志打印格式
stdout_handler.setFormatter(formatter)
# 将定义好的stdout_handler日志handler添加到root logger
# 定义一个Handler处理文件输出
file_handler = logging.FileHandler(log_filenamme, mode='w')
file_handler.setLevel(logging.INFO)
file_handler.setFormatter(formatter)
logging.getLogger('').addHandler(stdout_handler)
logging.getLogger('').addHandler(file_handler)
def print_stats():
logging.info('==================================================================================')

16
tools/upgrade/upgrade_checker.py
View File

@ -8,10 +8,17 @@ from mysql.connector import errorcode
import logging
import getopt
import time
import re
class UpgradeParams:
log_filename = 'upgrade_checker.log'
old_version = '4.0.0.0'
class PasswordMaskingFormatter(logging.Formatter):
def format(self, record):
s = super(PasswordMaskingFormatter, self).format(record)
return re.sub(r'password=\".*?\"', 'password=\"******\"', s)
#### --------------start : my_error.py --------------
class MyError(Exception):
def __init__(self, value):
@ -281,15 +288,18 @@ def config_logging_module(log_filenamme):
filename=log_filenamme,\
filemode='w')
# 定义日志打印格式
formatter = logging.Formatter('[%(asctime)s] %(levelname)s %(filename)s:%(lineno)d %(message)s', '%Y-%m-%d %H:%M:%S')
formatter = PasswordMaskingFormatter('[%(asctime)s] %(levelname)s %(filename)s:%(lineno)d %(message)s', '%Y-%m-%d %H:%M:%S')
#######################################
# 定义一个Handler打印INFO及以上级别的日志到sys.stdout
stdout_handler = logging.StreamHandler(sys.stdout)
stdout_handler.setLevel(logging.INFO)
# 设置日志打印格式
stdout_handler.setFormatter(formatter)
# 将定义好的stdout_handler日志handler添加到root logger
# 定义一个Handler处理文件输出
file_handler = logging.FileHandler(log_filenamme, mode='w')
file_handler.setLevel(logging.INFO)
file_handler.setFormatter(formatter)
logging.getLogger('').addHandler(stdout_handler)
logging.getLogger('').addHandler(file_handler)
#### ---------------end----------------------

15
tools/upgrade/upgrade_health_checker.py
View File

@ -8,10 +8,16 @@ import mysql.connector
from mysql.connector import errorcode
import logging
import getopt
import re
class UpgradeParams:
log_filename = 'upgrade_cluster_health_checker.log'
class PasswordMaskingFormatter(logging.Formatter):
def format(self, record):
s = super(PasswordMaskingFormatter, self).format(record)
return re.sub(r'password=\".*?\"', 'password=\"******\"', s)
#### --------------start : my_error.py --------------
class MyError(Exception):
def __init__(self, value):
@ -263,15 +269,18 @@ def config_logging_module(log_filenamme):
filename=log_filenamme,\
filemode='w')
# 定义日志打印格式
formatter = logging.Formatter('[%(asctime)s] %(levelname)s %(filename)s:%(lineno)d %(message)s', '%Y-%m-%d %H:%M:%S')
formatter = PasswordMaskingFormatter('[%(asctime)s] %(levelname)s %(filename)s:%(lineno)d %(message)s', '%Y-%m-%d %H:%M:%S')
#######################################
# 定义一个Handler打印INFO及以上级别的日志到sys.stdout
stdout_handler = logging.StreamHandler(sys.stdout)
stdout_handler.setLevel(logging.INFO)
# 设置日志打印格式
stdout_handler.setFormatter(formatter)
# 将定义好的stdout_handler日志handler添加到root logger
# 定义一个Handler处理文件输出
file_handler = logging.FileHandler(log_filenamme, mode='w')
file_handler.setLevel(logging.INFO)
file_handler.setFormatter(formatter)
logging.getLogger('').addHandler(stdout_handler)
logging.getLogger('').addHandler(file_handler)
#### ---------------end----------------------
def check_zone_valid(query_cur, zone):

61
tools/upgrade/upgrade_post.py
View File

@ -614,6 +614,7 @@
#import upgrade_health_checker
#import tenant_upgrade_action
#import upgrade_post_checker
#import re
#
## 由于用了/*+read_consistency(WEAK) */来查询，因此升级期间不能允许创建或删除租户
#
@ -622,6 +623,11 @@
# sql_dump_filename = config.post_upgrade_sql_filename
# rollback_sql_filename = config.post_upgrade_rollback_sql_filename
#
#class PasswordMaskingFormatter(logging.Formatter):
# def format(self, record):
# s = super(PasswordMaskingFormatter, self).format(record)
# return re.sub(r'password=\".*?\"', 'password=\"******\"', s)
#
#def config_logging_module(log_filenamme):
# logging.basicConfig(level=logging.INFO,\
# format='[%(asctime)s] %(levelname)s %(filename)s:%(lineno)d %(message)s',\
@ -629,15 +635,18 @@
# filename=log_filenamme,\
# filemode='w')
# # 定义日志打印格式
# formatter = logging.Formatter('[%(asctime)s] %(levelname)s %(filename)s:%(lineno)d %(message)s', '%Y-%m-%d %H:%M:%S')
# formatter = PasswordMaskingFormatter('[%(asctime)s] %(levelname)s %(filename)s:%(lineno)d %(message)s', '%Y-%m-%d %H:%M:%S')
# #######################################
# # 定义一个Handler打印INFO及以上级别的日志到sys.stdout
# stdout_handler = logging.StreamHandler(sys.stdout)
# stdout_handler.setLevel(logging.INFO)
# # 设置日志打印格式
# stdout_handler.setFormatter(formatter)
# # 将定义好的stdout_handler日志handler添加到root logger
# # 定义一个Handler处理文件输出
# file_handler = logging.FileHandler(log_filenamme, mode='w')
# file_handler.setLevel(logging.INFO)
# file_handler.setFormatter(formatter)
# logging.getLogger('').addHandler(stdout_handler)
# logging.getLogger('').addHandler(file_handler)
#
#def print_stats():
# logging.info('==================================================================================')
@ -770,6 +779,7 @@
#import mysql.connector
#from mysql.connector import errorcode
#import logging
#import re
#
#import config
#import opts
@ -785,6 +795,11 @@
# sql_dump_filename = config.pre_upgrade_sql_filename
# rollback_sql_filename = config.pre_upgrade_rollback_sql_filename
#
#class PasswordMaskingFormatter(logging.Formatter):
# def format(self, record):
# s = super(PasswordMaskingFormatter, self).format(record)
# return re.sub(r'password=\".*?\"', 'password=\"******\"', s)
#
#def config_logging_module(log_filenamme):
# logging.basicConfig(level=logging.INFO,\
# format='[%(asctime)s] %(levelname)s %(filename)s:%(lineno)d %(message)s',\
@ -792,15 +807,18 @@
# filename=log_filenamme,\
# filemode='w')
# # 定义日志打印格式
# formatter = logging.Formatter('[%(asctime)s] %(levelname)s %(filename)s:%(lineno)d %(message)s', '%Y-%m-%d %H:%M:%S')
# formatter = PasswordMaskingFormatter('[%(asctime)s] %(levelname)s %(filename)s:%(lineno)d %(message)s', '%Y-%m-%d %H:%M:%S')
# #######################################
# # 定义一个Handler打印INFO及以上级别的日志到sys.stdout
# stdout_handler = logging.StreamHandler(sys.stdout)
# stdout_handler.setLevel(logging.INFO)
# # 设置日志打印格式
# stdout_handler.setFormatter(formatter)
# # 将定义好的stdout_handler日志handler添加到root logger
# # 定义一个Handler处理文件输出
# file_handler = logging.FileHandler(log_filenamme, mode='w')
# file_handler.setLevel(logging.INFO)
# file_handler.setFormatter(formatter)
# logging.getLogger('').addHandler(stdout_handler)
# logging.getLogger('').addHandler(file_handler)
#
#def print_stats():
# logging.info('==================================================================================')
@ -1650,10 +1668,17 @@
#import logging
#import getopt
#import time
#import re
#
#class UpgradeParams:
# log_filename = 'upgrade_checker.log'
# old_version = '4.0.0.0'
#
#class PasswordMaskingFormatter(logging.Formatter):
# def format(self, record):
# s = super(PasswordMaskingFormatter, self).format(record)
# return re.sub(r'password=\".*?\"', 'password=\"******\"', s)
#
##### --------------start : my_error.py --------------
#class MyError(Exception):
# def __init__(self, value):
@ -1923,15 +1948,18 @@
# filename=log_filenamme,\
# filemode='w')
# # 定义日志打印格式
# formatter = logging.Formatter('[%(asctime)s] %(levelname)s %(filename)s:%(lineno)d %(message)s', '%Y-%m-%d %H:%M:%S')
# formatter = PasswordMaskingFormatter('[%(asctime)s] %(levelname)s %(filename)s:%(lineno)d %(message)s', '%Y-%m-%d %H:%M:%S')
# #######################################
# # 定义一个Handler打印INFO及以上级别的日志到sys.stdout
# stdout_handler = logging.StreamHandler(sys.stdout)
# stdout_handler.setLevel(logging.INFO)
# # 设置日志打印格式
# stdout_handler.setFormatter(formatter)
# # 将定义好的stdout_handler日志handler添加到root logger
# # 定义一个Handler处理文件输出
# file_handler = logging.FileHandler(log_filenamme, mode='w')
# file_handler.setLevel(logging.INFO)
# file_handler.setFormatter(formatter)
# logging.getLogger('').addHandler(stdout_handler)
# logging.getLogger('').addHandler(file_handler)
##### ---------------end----------------------
#
#
@ -2456,10 +2484,16 @@
#from mysql.connector import errorcode
#import logging
#import getopt
#import re
#
#class UpgradeParams:
# log_filename = 'upgrade_cluster_health_checker.log'
#
#class PasswordMaskingFormatter(logging.Formatter):
# def format(self, record):
# s = super(PasswordMaskingFormatter, self).format(record)
# return re.sub(r'password=\".*?\"', 'password=\"******\"', s)
#
##### --------------start : my_error.py --------------
#class MyError(Exception):
# def __init__(self, value):
@ -2711,15 +2745,18 @@
# filename=log_filenamme,\
# filemode='w')
# # 定义日志打印格式
# formatter = logging.Formatter('[%(asctime)s] %(levelname)s %(filename)s:%(lineno)d %(message)s', '%Y-%m-%d %H:%M:%S')
# formatter = PasswordMaskingFormatter('[%(asctime)s] %(levelname)s %(filename)s:%(lineno)d %(message)s', '%Y-%m-%d %H:%M:%S')
# #######################################
# # 定义一个Handler打印INFO及以上级别的日志到sys.stdout
# stdout_handler = logging.StreamHandler(sys.stdout)
# stdout_handler.setLevel(logging.INFO)
# # 设置日志打印格式
# stdout_handler.setFormatter(formatter)
# # 将定义好的stdout_handler日志handler添加到root logger
# # 定义一个Handler处理文件输出
# file_handler = logging.FileHandler(log_filenamme, mode='w')
# file_handler.setLevel(logging.INFO)
# file_handler.setFormatter(formatter)
# logging.getLogger('').addHandler(stdout_handler)
# logging.getLogger('').addHandler(file_handler)
##### ---------------end----------------------
#
#def check_zone_valid(query_cur, zone):

61
tools/upgrade/upgrade_pre.py
View File

@ -614,6 +614,7 @@
#import upgrade_health_checker
#import tenant_upgrade_action
#import upgrade_post_checker
#import re
#
## 由于用了/*+read_consistency(WEAK) */来查询，因此升级期间不能允许创建或删除租户
#
@ -622,6 +623,11 @@
# sql_dump_filename = config.post_upgrade_sql_filename
# rollback_sql_filename = config.post_upgrade_rollback_sql_filename
#
#class PasswordMaskingFormatter(logging.Formatter):
# def format(self, record):
# s = super(PasswordMaskingFormatter, self).format(record)
# return re.sub(r'password=\".*?\"', 'password=\"******\"', s)
#
#def config_logging_module(log_filenamme):
# logging.basicConfig(level=logging.INFO,\
# format='[%(asctime)s] %(levelname)s %(filename)s:%(lineno)d %(message)s',\
@ -629,15 +635,18 @@
# filename=log_filenamme,\
# filemode='w')
# # 定义日志打印格式
# formatter = logging.Formatter('[%(asctime)s] %(levelname)s %(filename)s:%(lineno)d %(message)s', '%Y-%m-%d %H:%M:%S')
# formatter = PasswordMaskingFormatter('[%(asctime)s] %(levelname)s %(filename)s:%(lineno)d %(message)s', '%Y-%m-%d %H:%M:%S')
# #######################################
# # 定义一个Handler打印INFO及以上级别的日志到sys.stdout
# stdout_handler = logging.StreamHandler(sys.stdout)
# stdout_handler.setLevel(logging.INFO)
# # 设置日志打印格式
# stdout_handler.setFormatter(formatter)
# # 将定义好的stdout_handler日志handler添加到root logger
# # 定义一个Handler处理文件输出
# file_handler = logging.FileHandler(log_filenamme, mode='w')
# file_handler.setLevel(logging.INFO)
# file_handler.setFormatter(formatter)
# logging.getLogger('').addHandler(stdout_handler)
# logging.getLogger('').addHandler(file_handler)
#
#def print_stats():
# logging.info('==================================================================================')
@ -770,6 +779,7 @@
#import mysql.connector
#from mysql.connector import errorcode
#import logging
#import re
#
#import config
#import opts
@ -785,6 +795,11 @@
# sql_dump_filename = config.pre_upgrade_sql_filename
# rollback_sql_filename = config.pre_upgrade_rollback_sql_filename
#
#class PasswordMaskingFormatter(logging.Formatter):
# def format(self, record):
# s = super(PasswordMaskingFormatter, self).format(record)
# return re.sub(r'password=\".*?\"', 'password=\"******\"', s)
#
#def config_logging_module(log_filenamme):
# logging.basicConfig(level=logging.INFO,\
# format='[%(asctime)s] %(levelname)s %(filename)s:%(lineno)d %(message)s',\
@ -792,15 +807,18 @@
# filename=log_filenamme,\
# filemode='w')
# # 定义日志打印格式
# formatter = logging.Formatter('[%(asctime)s] %(levelname)s %(filename)s:%(lineno)d %(message)s', '%Y-%m-%d %H:%M:%S')
# formatter = PasswordMaskingFormatter('[%(asctime)s] %(levelname)s %(filename)s:%(lineno)d %(message)s', '%Y-%m-%d %H:%M:%S')
# #######################################
# # 定义一个Handler打印INFO及以上级别的日志到sys.stdout
# stdout_handler = logging.StreamHandler(sys.stdout)
# stdout_handler.setLevel(logging.INFO)
# # 设置日志打印格式
# stdout_handler.setFormatter(formatter)
# # 将定义好的stdout_handler日志handler添加到root logger
# # 定义一个Handler处理文件输出
# file_handler = logging.FileHandler(log_filenamme, mode='w')
# file_handler.setLevel(logging.INFO)
# file_handler.setFormatter(formatter)
# logging.getLogger('').addHandler(stdout_handler)
# logging.getLogger('').addHandler(file_handler)
#
#def print_stats():
# logging.info('==================================================================================')
@ -1650,10 +1668,17 @@
#import logging
#import getopt
#import time
#import re
#
#class UpgradeParams:
# log_filename = 'upgrade_checker.log'
# old_version = '4.0.0.0'
#
#class PasswordMaskingFormatter(logging.Formatter):
# def format(self, record):
# s = super(PasswordMaskingFormatter, self).format(record)
# return re.sub(r'password=\".*?\"', 'password=\"******\"', s)
#
##### --------------start : my_error.py --------------
#class MyError(Exception):
# def __init__(self, value):
@ -1923,15 +1948,18 @@
# filename=log_filenamme,\
# filemode='w')
# # 定义日志打印格式
# formatter = logging.Formatter('[%(asctime)s] %(levelname)s %(filename)s:%(lineno)d %(message)s', '%Y-%m-%d %H:%M:%S')
# formatter = PasswordMaskingFormatter('[%(asctime)s] %(levelname)s %(filename)s:%(lineno)d %(message)s', '%Y-%m-%d %H:%M:%S')
# #######################################
# # 定义一个Handler打印INFO及以上级别的日志到sys.stdout
# stdout_handler = logging.StreamHandler(sys.stdout)
# stdout_handler.setLevel(logging.INFO)
# # 设置日志打印格式
# stdout_handler.setFormatter(formatter)
# # 将定义好的stdout_handler日志handler添加到root logger
# # 定义一个Handler处理文件输出
# file_handler = logging.FileHandler(log_filenamme, mode='w')
# file_handler.setLevel(logging.INFO)
# file_handler.setFormatter(formatter)
# logging.getLogger('').addHandler(stdout_handler)
# logging.getLogger('').addHandler(file_handler)
##### ---------------end----------------------
#
#
@ -2456,10 +2484,16 @@
#from mysql.connector import errorcode
#import logging
#import getopt
#import re
#
#class UpgradeParams:
# log_filename = 'upgrade_cluster_health_checker.log'
#
#class PasswordMaskingFormatter(logging.Formatter):
# def format(self, record):
# s = super(PasswordMaskingFormatter, self).format(record)
# return re.sub(r'password=\".*?\"', 'password=\"******\"', s)
#
##### --------------start : my_error.py --------------
#class MyError(Exception):
# def __init__(self, value):
@ -2711,15 +2745,18 @@
# filename=log_filenamme,\
# filemode='w')
# # 定义日志打印格式
# formatter = logging.Formatter('[%(asctime)s] %(levelname)s %(filename)s:%(lineno)d %(message)s', '%Y-%m-%d %H:%M:%S')
# formatter = PasswordMaskingFormatter('[%(asctime)s] %(levelname)s %(filename)s:%(lineno)d %(message)s', '%Y-%m-%d %H:%M:%S')
# #######################################
# # 定义一个Handler打印INFO及以上级别的日志到sys.stdout
# stdout_handler = logging.StreamHandler(sys.stdout)
# stdout_handler.setLevel(logging.INFO)
# # 设置日志打印格式
# stdout_handler.setFormatter(formatter)
# # 将定义好的stdout_handler日志handler添加到root logger
# # 定义一个Handler处理文件输出
# file_handler = logging.FileHandler(log_filenamme, mode='w')
# file_handler.setLevel(logging.INFO)
# file_handler.setFormatter(formatter)
# logging.getLogger('').addHandler(stdout_handler)
# logging.getLogger('').addHandler(file_handler)
##### ---------------end----------------------
#
#def check_zone_valid(query_cur, zone):