Skip to content

Commit 1291c77

Browse files
Merge pull request ClickHouse#79357 from azat/tests/02441_alter_delete_and_drop_column
tests: fix 02441_alter_delete_and_drop_column flakiness (filter out GET_PART)
2 parents e186d9e + a95f28f commit 1291c77

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

tests/queries/0_stateless/02441_alter_delete_and_drop_column.sql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ alter table mut delete where n = 10;
1111
-- a funny way to wait for a MUTATE_PART to be assigned
1212
select sleepEachRow(2) from url('http://localhost:8123/?param_tries={1..10}&query=' || encodeURLComponent(
1313
'select 1 where ''MUTATE_PART'' not in (select type from system.replication_queue where database=''' || currentDatabase() || ''' and table=''mut'')'
14-
), 'LineAsString', 's String') settings max_threads=1 format Null;
14+
), 'LineAsString', 's String') settings max_threads=1, http_make_head_request=0 format Null;
1515

1616
alter table mut drop column k settings alter_sync=0;
1717
system sync replica mut pull;
1818

1919
-- a funny way to wait for ALTER_METADATA to disappear from the replication queue
2020
select sleepEachRow(2) from url('http://localhost:8123/?param_tries={1..10}&query=' || encodeURLComponent(
2121
'select * from system.replication_queue where database=''' || currentDatabase() || ''' and table=''mut'' and type=''ALTER_METADATA'''
22-
), 'LineAsString', 's String') settings max_threads=1 format Null;
22+
), 'LineAsString', 's String') settings max_threads=1, http_make_head_request=0 format Null;
2323

24-
select type, new_part_name, parts_to_merge from system.replication_queue where database=currentDatabase() and table='mut';
24+
select type, new_part_name, parts_to_merge from system.replication_queue where database=currentDatabase() and table='mut' and type != 'GET_PART';
2525
system start merges mut;
2626
set receive_timeout=30;
2727
system sync replica mut;

tests/queries/0_stateless/02448_clone_replica_lost_part.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ optimize table rmt2;
147147

148148
select sleepEachRow(2) from url('http://localhost:8123/?param_tries={1..10}&query=' || encodeURLComponent(
149149
'select value from system.zookeeper where path=''/test/02448/' || currentDatabase() || '/rmt/replicas/1'' and name=''is_lost'' and value=''0'''
150-
), 'LineAsString', 's String') settings max_threads=1 format Null;
150+
), 'LineAsString', 's String') settings max_threads=1, http_make_head_request=0 format Null;
151151

152152
-- rmt1 will mimic rmt2, but will not be able to fetch parts for a while
153153
system stop replicated sends rmt2;

tests/queries/0_stateless/02789_reading_from_s3_with_connection_pool.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ do
5858
-- queryID() will be returned for each row, since the query above doesn't return anything we need to return a fake row
5959
union all
6060
select 1
61-
) limit 1 settings max_threads=1;
61+
) limit 1 settings max_threads=1, http_make_head_request=0;
6262
" 2>&1)
6363
${CLICKHOUSE_CLIENT} --query "SYSTEM FLUSH LOGS query_log"
6464
RES=$(${CLICKHOUSE_CLIENT} -m --query "

0 commit comments

Comments
 (0)