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

Merge pull request #41510 from kssenii/maybe-fix-storage-nats-tests

Browse Source 
Try fix flaky test_storage_nats
This commit is contained in:
Kseniia Sumarokova 2022-09-20 11:32:10 +02:00 committed by GitHub
commit fb93ca7ca8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Storages/NATS/NATSSettings.h
View File

@ -24,7 +24,8 @@ class ASTStorage;
M(Milliseconds, nats_flush_interval_ms, 0, "Timeout for flushing data from NATS.", 0) \ M(Milliseconds, nats_flush_interval_ms, 0, "Timeout for flushing data from NATS.", 0) \
M(String, nats_username, "", "NATS username", 0) \ M(String, nats_username, "", "NATS username", 0) \
M(String, nats_password, "", "NATS password", 0) \ M(String, nats_password, "", "NATS password", 0) \
M(String, nats_token, "", "NATS token", 0) M(String, nats_token, "", "NATS token", 0) \
M(UInt64, nats_startup_connect_tries, 5, "Number of connect tries at startup", 0) \
#define LIST_OF_NATS_SETTINGS(M) \ #define LIST_OF_NATS_SETTINGS(M) \
NATS_RELATED_SETTINGS(M) \ NATS_RELATED_SETTINGS(M) \

18
src/Storages/NATS/StorageNATS.cpp
View File

@ -91,12 +91,26 @@ StorageNATS::StorageNATS(
nats_context->makeQueryContext(); nats_context->makeQueryContext();
try try
{
size_t num_tries = nats_settings->nats_startup_connect_tries;
for (size_t i = 0; i < num_tries; ++i)
{ {
connection = std::make_shared<NATSConnectionManager>(configuration, log); connection = std::make_shared<NATSConnectionManager>(configuration, log);
if (!connection->connect())
throw Exception(ErrorCodes::CANNOT_CONNECT_NATS, "Cannot connect to {}. Nats last error: {}", if (connection->connect())
break;
if (i == num_tries - 1)
{
throw Exception(
ErrorCodes::CANNOT_CONNECT_NATS,
"Cannot connect to {}. Nats last error: {}",
connection->connectionInfoForLog(), nats_GetLastError(nullptr)); connection->connectionInfoForLog(), nats_GetLastError(nullptr));
} }
LOG_DEBUG(log, "Connect attempt #{} failed, error: {}. Reconnecting...", i + 1, nats_GetLastError(nullptr));
}
}
catch (...) catch (...)
{ {
tryLogCurrentException(log); tryLogCurrentException(log);