Fix backward compatibility check

ClickHouse · Jan 29, 2024 · cef109a · cef109a
1 parent b864b12
commit cef109a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/docker/test/stateless/stress_tests.lib b/docker/test/stateless/stress_tests.lib
@@ -78,7 +78,7 @@ function configure()
         randomize_config_boolean_value use_compression zookeeper
     fi
 
-    randomize_config_boolean_value allow_experimental_block_number_column merge_tree_settings
+    randomize_config_boolean_value allow_experimental_block_number_column block_number
 
     # for clickhouse-server (via service)
     echo "ASAN_OPTIONS='malloc_context_size=10 verbosity=1 allocator_release_to_os_interval_ms=10000'" >> /etc/environment

diff --git a/docker/test/upgrade/run.sh b/docker/test/upgrade/run.sh
@@ -122,6 +122,7 @@ rm /etc/clickhouse-server/config.d/merge_tree.xml
 rm /etc/clickhouse-server/config.d/enable_wait_for_shutdown_replicated_tables.xml
 rm /etc/clickhouse-server/config.d/zero_copy_destructive_operations.xml
 rm /etc/clickhouse-server/config.d/storage_conf_02963.xml
+rm /etc/clickhouse-server/config.d/block_number.xml
 rm /etc/clickhouse-server/users.d/nonconst_timezone.xml
 rm /etc/clickhouse-server/users.d/s3_cache_new.xml
 rm /etc/clickhouse-server/users.d/replicated_ddl_entry.xml

diff --git a/tests/config/config.d/block_number.xml b/tests/config/config.d/block_number.xml
@@ -0,0 +1,6 @@
+<clickhouse>
+    <merge_tree>
+        <!-- Setting randomized for stress test, it is disabled here and this line is used to randomize it in the script -->
+        <allow_experimental_block_number_column>0</allow_experimental_block_number_column>
+    </merge_tree>
+</clickhouse>
diff --git a/tests/config/config.d/merge_tree_settings.xml b/tests/config/config.d/merge_tree_settings.xml
@@ -2,7 +2,5 @@
     <merge_tree>
         <!-- 10 seconds (default is 1 minute) -->
         <zookeeper_session_expiration_check_period>10</zookeeper_session_expiration_check_period>
-        <!-- Setting randomized for stress test, it is disabled here and this line is used to randomize it in the script -->
-        <allow_experimental_block_number_column>0</allow_experimental_block_number_column>
     </merge_tree>
 </clickhouse>
diff --git a/tests/config/install.sh b/tests/config/install.sh
@@ -64,6 +64,7 @@ ln -sf $SRC_PATH/config.d/backups.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/filesystem_caches_path.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/validate_tcp_client_information.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/zero_copy_destructive_operations.xml $DEST_SERVER_PATH/config.d/
+ln -sf $SRC_PATH/config.d/block_number.xml $DEST_SERVER_PATH/config.d/
 
 # Not supported with fasttest.
 if [ "${DEST_SERVER_PATH}" = "/etc/clickhouse-server" ]