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

fix flaky test

Browse Source
This commit is contained in:
Alexander Tokmakov 2022-04-28 21:39:45 +02:00
parent 11f40376ae
commit 6797e7dc76
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Interpreters/DDLWorker.cpp
View File

@ -47,6 +47,7 @@ namespace ErrorCodes
extern const int TIMEOUT_EXCEEDED; extern const int TIMEOUT_EXCEEDED;
extern const int UNFINISHED; extern const int UNFINISHED;
extern const int NOT_A_LEADER; extern const int NOT_A_LEADER;
extern const int TABLE_IS_READ_ONLY;
extern const int KEEPER_EXCEPTION; extern const int KEEPER_EXCEPTION;
extern const int CANNOT_ASSIGN_ALTER; extern const int CANNOT_ASSIGN_ALTER;
extern const int CANNOT_ALLOCATE_MEMORY; extern const int CANNOT_ALLOCATE_MEMORY;
@ -459,6 +460,7 @@ bool DDLWorker::tryExecuteQuery(const String & query, DDLTaskBase & task, const
/// and consider query as executed with status "failed" and return true in other cases. /// and consider query as executed with status "failed" and return true in other cases.
bool no_sense_to_retry = e.code() != ErrorCodes::KEEPER_EXCEPTION && bool no_sense_to_retry = e.code() != ErrorCodes::KEEPER_EXCEPTION &&
e.code() != ErrorCodes::NOT_A_LEADER && e.code() != ErrorCodes::NOT_A_LEADER &&
e.code() != ErrorCodes::TABLE_IS_READ_ONLY &&
e.code() != ErrorCodes::CANNOT_ASSIGN_ALTER && e.code() != ErrorCodes::CANNOT_ASSIGN_ALTER &&
e.code() != ErrorCodes::CANNOT_ALLOCATE_MEMORY && e.code() != ErrorCodes::CANNOT_ALLOCATE_MEMORY &&
e.code() != ErrorCodes::MEMORY_LIMIT_EXCEEDED; e.code() != ErrorCodes::MEMORY_LIMIT_EXCEEDED;

10
tests/integration/test_ddl_worker_non_leader/test.py
View File

@ -24,13 +24,17 @@ def started_cluster():
def test_non_leader_replica(started_cluster): def test_non_leader_replica(started_cluster):
node1.query("DROP TABLE IF EXISTS sometable SYNC")
node2.query("DROP TABLE IF EXISTS sometable SYNC")
node1.query("DROP TABLE IF EXISTS new_table_with_ddl")
node2.query("DROP TABLE IF EXISTS new_table_with_ddl")
node1.query_with_retry( node1.query(
"""CREATE TABLE IF NOT EXISTS sometable(id UInt32, value String) """CREATE TABLE IF NOT EXISTS sometable(id UInt32, value String)
ENGINE = ReplicatedMergeTree('/clickhouse/tables/0/sometable', '1') ORDER BY tuple()""" ENGINE = ReplicatedMergeTree('/clickhouse/tables/0/sometable', '1') ORDER BY tuple()"""
) )
node2.query_with_retry( node2.query(
"""CREATE TABLE IF NOT EXISTS sometable(id UInt32, value String) """CREATE TABLE IF NOT EXISTS sometable(id UInt32, value String)
ENGINE = ReplicatedMergeTree('/clickhouse/tables/0/sometable', '2') ORDER BY tuple() SETTINGS replicated_can_become_leader = 0""" ENGINE = ReplicatedMergeTree('/clickhouse/tables/0/sometable', '2') ORDER BY tuple() SETTINGS replicated_can_become_leader = 0"""
) )
@ -38,7 +42,7 @@ def test_non_leader_replica(started_cluster):
node1.query( node1.query(
"INSERT INTO sometable SELECT number, toString(number) FROM numbers(100)" "INSERT INTO sometable SELECT number, toString(number) FROM numbers(100)"
) )
node2.query_with_retry("SYSTEM SYNC REPLICA sometable", timeout=10) node2.query("SYSTEM SYNC REPLICA sometable")
assert node1.query("SELECT COUNT() FROM sometable") == "100\n" assert node1.query("SELECT COUNT() FROM sometable") == "100\n"
assert node2.query("SELECT COUNT() FROM sometable") == "100\n" assert node2.query("SELECT COUNT() FROM sometable") == "100\n"