thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 15:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22118 from ClickHouse/try_to_fix992

Browse Source 
Trying to fix my favorite test
This commit is contained in:
alesapin 2021-03-27 10:17:14 +03:00 committed by GitHub
commit 3b119355d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Storages/StorageReplicatedMergeTree.cpp
View File

@ -4932,7 +4932,7 @@ bool StorageReplicatedMergeTree::waitForTableReplicaToProcessLogEntry(
const auto & stop_waiting = [&]()
{
bool stop_waiting_itself = waiting_itself && is_dropped;
bool stop_waiting_itself = waiting_itself && (partial_shutdown_called || is_dropped);
bool stop_waiting_non_active = !wait_for_non_active && !getZooKeeper()->exists(table_zookeeper_path + "/replicas/" + replica + "/is_active");
return stop_waiting_itself || stop_waiting_non_active;
};

8
tests/queries/0_stateless/00992_system_parts_race_condition_zookeeper_long.sh
View File

@ -74,7 +74,7 @@ timeout $TIMEOUT bash -c thread5 2> /dev/null &
wait
$CLICKHOUSE_CLIENT -n -q "
DROP TABLE alter_table;
DROP TABLE alter_table2
"
$CLICKHOUSE_CLIENT -n -q "DROP TABLE alter_table;" &
$CLICKHOUSE_CLIENT -n -q "DROP TABLE alter_table2;" &
wait

1
tests/queries/skip_list.json
View File

@ -583,6 +583,7 @@
"00980_zookeeper_merge_tree_alter_settings",
"00988_constraints_replication_zookeeper",
"00989_parallel_parts_loading",
"00992_system_parts_race_condition_zookeeper_long",
"00993_system_parts_race_condition_drop_zookeeper",
"01012_show_tables_limit",
"01013_sync_replica_timeout_zookeeper",