do not change the default of _max_trx_size while bootstrap

src/rootserver/ob_root_service.cpp

@@ -2853,8 +2853,8 @@ int ObRootService::execute_bootstrap(const obrpc::ObBootstrapArg& arg)
       LOG_WARN("failed to update baseline schema version", K(ret));
     } else if (OB_FAIL(global_proxy.get_baseline_schema_version(frozen_version, baseline_schema_version_))) {
       LOG_WARN("fail to get baseline schema version", KR(ret));
-    } else if (OB_FAIL(set_max_trx_size_config())) {
-      LOG_WARN("fail to set max trx size config", K(ret));
+    // } else if (OB_FAIL(set_max_trx_size_config())) {
+    // LOG_WARN("fail to set max trx size config", K(ret));
     } else if (OB_FAIL(set_1pc_config())) {
       LOG_WARN("fail to set one phase commit config", K(ret));
     } else if (OB_FAIL(set_enable_oracle_priv_check())) {

tools/upgrade/upgrade_checker.py

@@ -597,6 +597,11 @@ def check_duplicate_index_name_in_mysql(query_cur, cur):
   if (len(results) != 0) :
     raise MyError("Duplicate index name exist in mysql tenant")
 
+# 31. check the _max_trx_size
+def check_max_trx_size_config(query_cur, cur):
+  set_parameter(cur, '_max_trx_size', '100G')
+  logging.info('set _max_trx_size to default value 100G')
+
 # 开始升级前的检查
 def do_check(my_host, my_port, my_user, my_passwd, upgrade_params):
   try:
@@ -631,6 +636,7 @@ def do_check(my_host, my_port, my_user, my_passwd, upgrade_params):
       check_sys_table_leader(query_cur)
       check_and_modify_px_query(query_cur, cur)
       check_duplicate_index_name_in_mysql(query_cur, cur)
+      check_max_trx_size_config(query_cur, cur)
     except Exception, e:
       logging.exception('run error')
       raise e

tools/upgrade/upgrade_post.py

@@ -8130,6 +8130,21 @@
 #  if (len(results) != 0) :
 #    raise MyError("Duplicate index name exist in mysql tenant")
 #
+## 31. check the _max_trx_size
+#def check_max_trx_size_config(query_cur, cur):
+#  (desc, results) = query_cur.exec_query(
+#      """
+#      select distinct(value) from __all_sys_parameter where name like '_max_trx_size'
+#      """)
+#  if len(results) != 1:
+#    raise MyError("failed to get config of _max_trx_size")
+#
+#  if results[0][0] == '100M':
+#    set_parameter(cur, '_max_trx_size', '100G')
+#    logging.info('set _max_trx_size to default value 100G')
+#  else:
+#    logging.info('leave _max_trx_size untouch ' + str(results[0][0]))
+#
 ## 开始升级前的检查
 #def do_check(my_host, my_port, my_user, my_passwd, upgrade_params):
 #  try:
@@ -8164,6 +8179,7 @@
 #      check_sys_table_leader(query_cur)
 #      check_and_modify_px_query(query_cur, cur)
 #      check_duplicate_index_name_in_mysql(query_cur, cur)
+#      check_max_trx_size_config(query_cur, cur)
 #    except Exception, e:
 #      logging.exception('run error')
 #      raise e

tools/upgrade/upgrade_pre.py

@@ -8130,6 +8130,21 @@
 #  if (len(results) != 0) :
 #    raise MyError("Duplicate index name exist in mysql tenant")
 #
+## 31. check the _max_trx_size
+#def check_max_trx_size_config(query_cur, cur):
+#  (desc, results) = query_cur.exec_query(
+#      """
+#      select distinct(value) from __all_sys_parameter where name like '_max_trx_size'
+#      """)
+#  if len(results) != 1:
+#    raise MyError("failed to get config of _max_trx_size")
+#
+#  if results[0][0] == '100M':
+#    set_parameter(cur, '_max_trx_size', '100G')
+#    logging.info('set _max_trx_size to default value 100G')
+#  else:
+#    logging.info('leave _max_trx_size untouch ' + str(results[0][0]))
+#
 ## 开始升级前的检查
 #def do_check(my_host, my_port, my_user, my_passwd, upgrade_params):
 #  try:
@@ -8164,6 +8179,7 @@
 #      check_sys_table_leader(query_cur)
 #      check_and_modify_px_query(query_cur, cur)
 #      check_duplicate_index_name_in_mysql(query_cur, cur)
+#      check_max_trx_size_config(query_cur, cur)
 #    except Exception, e:
 #      logging.exception('run error')
 #      raise e