diff --git a/tools/upgrade/special_upgrade_action_pre.py b/tools/upgrade/special_upgrade_action_pre.py index 77317c6bf6..d1a0f988a2 100755 --- a/tools/upgrade/special_upgrade_action_pre.py +++ b/tools/upgrade/special_upgrade_action_pre.py @@ -30,6 +30,12 @@ def do_special_upgrade(conn, cur, timeout, user, passwd): actions.set_parameter(cur, 'enable_major_freeze', 'False', timeout) actions.set_tenant_parameter(cur, '_enable_adaptive_compaction', 'False', timeout) actions.do_suspend_merge(cur, timeout) + # When upgrading from a version prior to 4.2 to version 4.2, the bloom_filter should be disabled. + # The param _bloom_filter_enabled is no longer in use as of version 4.2, there is no need to enable it again. + if actions.get_version(current_version) < actions.get_version('4.2.0.0')\ + and actions.get_version(target_version) >= actions.get_version('4.2.0.0'): + actions.set_tenant_parameter(cur, '_bloom_filter_enabled', 'False', timeout) + ####========******####======== actions begin ========####******========#### return ####========******####========= actions end =========####******========#### diff --git a/tools/upgrade/upgrade_post.py b/tools/upgrade/upgrade_post.py index f9774bcb50..1c903ff2b2 100755 --- a/tools/upgrade/upgrade_post.py +++ b/tools/upgrade/upgrade_post.py @@ -1244,6 +1244,12 @@ # actions.set_parameter(cur, 'enable_major_freeze', 'False', timeout) # actions.set_tenant_parameter(cur, '_enable_adaptive_compaction', 'False', timeout) # actions.do_suspend_merge(cur, timeout) +# # When upgrading from a version prior to 4.2 to version 4.2, the bloom_filter should be disabled. +# # The param _bloom_filter_enabled is no longer in use as of version 4.2, there is no need to enable it again. +# if actions.get_version(current_version) < actions.get_version('4.2.0.0')\ +# and actions.get_version(target_version) >= actions.get_version('4.2.0.0'): +# actions.set_tenant_parameter(cur, '_bloom_filter_enabled', 'False', timeout) +# #####========******####======== actions begin ========####******========#### # return #####========******####========= actions end =========####******========#### diff --git a/tools/upgrade/upgrade_pre.py b/tools/upgrade/upgrade_pre.py index a1c9eeb8f5..9a75c45a42 100755 --- a/tools/upgrade/upgrade_pre.py +++ b/tools/upgrade/upgrade_pre.py @@ -1244,6 +1244,12 @@ # actions.set_parameter(cur, 'enable_major_freeze', 'False', timeout) # actions.set_tenant_parameter(cur, '_enable_adaptive_compaction', 'False', timeout) # actions.do_suspend_merge(cur, timeout) +# # When upgrading from a version prior to 4.2 to version 4.2, the bloom_filter should be disabled. +# # The param _bloom_filter_enabled is no longer in use as of version 4.2, there is no need to enable it again. +# if actions.get_version(current_version) < actions.get_version('4.2.0.0')\ +# and actions.get_version(target_version) >= actions.get_version('4.2.0.0'): +# actions.set_tenant_parameter(cur, '_bloom_filter_enabled', 'False', timeout) +# #####========******####======== actions begin ========####******========#### # return #####========******####========= actions end =========####******========####