remove enable_sys_table_ddl in upgrade script

tools/upgrade/tenant_upgrade_action.py

@@ -236,8 +236,6 @@ def run_upgrade_job(conn, cur, job_name, timeout):
       ori_enable_ddl = actions.get_ori_enable_ddl(cur, timeout)
       if ori_enable_ddl == 0:
         actions.set_parameter(cur, 'enable_ddl', 'True', timeout)
-      # enable_sys_table_ddl
-      actions.set_parameter(cur, 'enable_sys_table_ddl', 'True', timeout)
       # get max_used_job_id
       max_used_job_id = get_max_used_job_id(cur)
       # run upgrade job
@@ -246,8 +244,6 @@ def run_upgrade_job(conn, cur, job_name, timeout):
       cur.execute(sql)
       # check upgrade job result
       check_upgrade_job_result(cur, job_name, timeout, max_used_job_id)
-      # reset enable_sys_table_ddl
-      actions.set_parameter(cur, 'enable_sys_table_ddl', 'False', timeout)
       # reset enable_ddl
       if ori_enable_ddl == 0:
         actions.set_parameter(cur, 'enable_ddl', 'False', timeout)

tools/upgrade/upgrade_post.py

@@ -1630,8 +1630,6 @@
 #      ori_enable_ddl = actions.get_ori_enable_ddl(cur, timeout)
 #      if ori_enable_ddl == 0:
 #        actions.set_parameter(cur, 'enable_ddl', 'True', timeout)
-#      # enable_sys_table_ddl
-#      actions.set_parameter(cur, 'enable_sys_table_ddl', 'True', timeout)
 #      # get max_used_job_id
 #      max_used_job_id = get_max_used_job_id(cur)
 #      # run upgrade job
@@ -1640,8 +1638,6 @@
 #      cur.execute(sql)
 #      # check upgrade job result
 #      check_upgrade_job_result(cur, job_name, timeout, max_used_job_id)
-#      # reset enable_sys_table_ddl
-#      actions.set_parameter(cur, 'enable_sys_table_ddl', 'False', timeout)
 #      # reset enable_ddl
 #      if ori_enable_ddl == 0:
 #        actions.set_parameter(cur, 'enable_ddl', 'False', timeout)
@@ -3303,6 +3299,10 @@
 #def enable_direct_load(cur, timeout):
 #  actions.set_parameter(cur, '_ob_enable_direct_load', 'True', timeout)
 #
+## 9 关闭enable_sys_table_ddl
+#def disable_sys_table_ddl(cur, timeout):
+#  actions.set_parameter(cur, 'enable_sys_table_ddl', 'False', timeout)
+#
 ## 开始升级后的检查
 #def do_check(conn, cur, query_cur, timeout):
 #  try:
@@ -3314,6 +3314,7 @@
 #    enable_rereplication(cur, timeout)
 #    enable_major_freeze(cur, timeout)
 #    enable_direct_load(cur, timeout)
+#    disable_sys_table_ddl(cur, timeout)
 #  except Exception as e:
 #    logging.exception('run error')
 #    raise

tools/upgrade/upgrade_post_checker.py

@@ -126,6 +126,10 @@ def enable_major_freeze(cur, timeout):
 def enable_direct_load(cur, timeout):
   actions.set_parameter(cur, '_ob_enable_direct_load', 'True', timeout)
 
+# 9 关闭enable_sys_table_ddl
+def disable_sys_table_ddl(cur, timeout):
+  actions.set_parameter(cur, 'enable_sys_table_ddl', 'False', timeout)
+
 # 开始升级后的检查
 def do_check(conn, cur, query_cur, timeout):
   try:
@@ -137,6 +141,7 @@ def do_check(conn, cur, query_cur, timeout):
     enable_rereplication(cur, timeout)
     enable_major_freeze(cur, timeout)
     enable_direct_load(cur, timeout)
+    disable_sys_table_ddl(cur, timeout)
   except Exception as e:
     logging.exception('run error')
     raise

tools/upgrade/upgrade_pre.py

@@ -1630,8 +1630,6 @@
 #      ori_enable_ddl = actions.get_ori_enable_ddl(cur, timeout)
 #      if ori_enable_ddl == 0:
 #        actions.set_parameter(cur, 'enable_ddl', 'True', timeout)
-#      # enable_sys_table_ddl
-#      actions.set_parameter(cur, 'enable_sys_table_ddl', 'True', timeout)
 #      # get max_used_job_id
 #      max_used_job_id = get_max_used_job_id(cur)
 #      # run upgrade job
@@ -1640,8 +1638,6 @@
 #      cur.execute(sql)
 #      # check upgrade job result
 #      check_upgrade_job_result(cur, job_name, timeout, max_used_job_id)
-#      # reset enable_sys_table_ddl
-#      actions.set_parameter(cur, 'enable_sys_table_ddl', 'False', timeout)
 #      # reset enable_ddl
 #      if ori_enable_ddl == 0:
 #        actions.set_parameter(cur, 'enable_ddl', 'False', timeout)
@@ -3303,6 +3299,10 @@
 #def enable_direct_load(cur, timeout):
 #  actions.set_parameter(cur, '_ob_enable_direct_load', 'True', timeout)
 #
+## 9 关闭enable_sys_table_ddl
+#def disable_sys_table_ddl(cur, timeout):
+#  actions.set_parameter(cur, 'enable_sys_table_ddl', 'False', timeout)
+#
 ## 开始升级后的检查
 #def do_check(conn, cur, query_cur, timeout):
 #  try:
@@ -3314,6 +3314,7 @@
 #    enable_rereplication(cur, timeout)
 #    enable_major_freeze(cur, timeout)
 #    enable_direct_load(cur, timeout)
+#    disable_sys_table_ddl(cur, timeout)
 #  except Exception as e:
 #    logging.exception('run error')
 #    raise