Merge pull request #21696 from azat/stress-tests-fixes

Tests fixes (that was found by stress tests)

tests/queries/0_stateless/00966_live_view_watch_events_http.py

@@ -28,13 +28,14 @@ with client(name='client1>', log=log) as client1:
     client1.expect(prompt)
 
 
-    with http_client({'method':'GET', 'url': '/?allow_experimental_live_view=1&query=WATCH%20test.lv%20EVENTS'}, name='client2>', log=log) as client2:
-        client2.expect('.*1\n')
-        client1.send('INSERT INTO test.mt VALUES (1),(2),(3)')
+    try:
+        with http_client({'method':'GET', 'url': '/?allow_experimental_live_view=1&query=WATCH%20test.lv%20EVENTS'}, name='client2>', log=log) as client2:
+            client2.expect('.*1\n')
+            client1.send('INSERT INTO test.mt VALUES (1),(2),(3)')
+            client1.expect(prompt)
+            client2.expect('.*2\n')
+    finally:
+        client1.send('DROP TABLE test.lv')
+        client1.expect(prompt)
+        client1.send('DROP TABLE test.mt')
         client1.expect(prompt)
-        client2.expect('.*2\n')
-
-    client1.send('DROP TABLE test.lv')
-    client1.expect(prompt)
-    client1.send('DROP TABLE test.mt')
-    client1.expect(prompt)

tests/queries/0_stateless/00967_live_view_watch_http.py

@@ -27,14 +27,14 @@ with client(name='client1>', log=log) as client1:
     client1.send('CREATE LIVE VIEW test.lv AS SELECT sum(a) FROM test.mt')
     client1.expect(prompt)
 
-
-    with http_client({'method':'GET', 'url':'/?allow_experimental_live_view=1&query=WATCH%20test.lv'}, name='client2>', log=log) as client2:
-        client2.expect('.*0\t1\n')
-        client1.send('INSERT INTO test.mt VALUES (1),(2),(3)')
+    try:
+        with http_client({'method':'GET', 'url':'/?allow_experimental_live_view=1&query=WATCH%20test.lv'}, name='client2>', log=log) as client2:
+            client2.expect('.*0\t1\n')
+            client1.send('INSERT INTO test.mt VALUES (1),(2),(3)')
+            client1.expect(prompt)
+            client2.expect('.*6\t2\n')
+    finally:
+        client1.send('DROP TABLE test.lv')
+        client1.expect(prompt)
+        client1.send('DROP TABLE test.mt')
         client1.expect(prompt)
-        client2.expect('.*6\t2\n')
-
-    client1.send('DROP TABLE test.lv')
-    client1.expect(prompt)
-    client1.send('DROP TABLE test.mt')
-    client1.expect(prompt)

tests/queries/0_stateless/01035_lc_empty_part_bug.sh

@@ -8,7 +8,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 ${CLICKHOUSE_CLIENT} --multiquery --query="
     DROP TABLE IF EXISTS lc_empty_part_bug;
-    create table lc_empty_part_bug (id  UInt64, s String) Engine=MergeTree ORDER BY id;
+    create table lc_empty_part_bug (id  UInt64, s String) Engine=MergeTree ORDER BY id SETTINGS number_of_free_entries_in_pool_to_execute_mutation=0;
     insert into lc_empty_part_bug select number as id, toString(rand()) from numbers(100);
     alter table lc_empty_part_bug delete where id < 100;
 " --mutations_sync=1

tests/queries/0_stateless/01294_lazy_database_concurrent_recreate_reattach_and_show_tables.sh → tests/queries/0_stateless/01294_lazy_database_concurrent_recreate_reattach_and_show_tables_long.sh

@@ -70,8 +70,10 @@ function recreate_lazy_func4()
 function test_func()
 {
     while true; do
-        $CLICKHOUSE_CLIENT -q "SYSTEM STOP TTL MERGES";
+        for table in log tlog slog tlog2; do
+            $CLICKHOUSE_CLIENT -q "SYSTEM STOP TTL MERGES $CURR_DATABASE.$table" >& /dev/null
         done
+    done
 }
 
 

tests/queries/query_test.py

@@ -46,7 +46,7 @@ SKIP_LIST = [
     "01293_client_interactive_vertical_singleline",  # expect-test
     "01293_system_distribution_queue",  # FLAKY
     "01293_show_clusters",
-    "01294_lazy_database_concurrent_recreate_reattach_and_show_tables",
+    "01294_lazy_database_concurrent_recreate_reattach_and_show_tables_long",
     "01294_system_distributed_on_cluster",
     "01300_client_save_history_when_terminated",  # expect-test
     "01304_direct_io",

tests/queries/skip_list.json

@@ -396,7 +396,7 @@
         "01293_pretty_max_value_width",
         "01293_show_settings",
         "01294_create_settings_profile",
-        "01294_lazy_database_concurrent_recreate_reattach_and_show_tables",
+        "01294_lazy_database_concurrent_recreate_reattach_and_show_tables_long",
         "01295_create_row_policy",
         "01296_create_row_policy_in_current_database",
         "01297_create_quota",
@@ -681,7 +681,7 @@
         "01281_unsucceeded_insert_select_queries_counter",
         "01293_system_distribution_queue",
         "01294_lazy_database_concurrent",
-        "01294_lazy_database_concurrent_recreate_reattach_and_show_tables",
+        "01294_lazy_database_concurrent_recreate_reattach_and_show_tables_long",
         "01294_system_distributed_on_cluster",
         "01296_create_row_policy_in_current_database",
         "01297_create_quota",