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

Fix test

Browse Source
This commit is contained in:
kssenii 2023-10-13 12:57:57 +02:00
parent d64b990712
commit bfe174f71b
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Interpreters/Context.cpp
View File

@ -3590,7 +3590,7 @@ std::shared_ptr<FilesystemCacheLog> Context::getFilesystemCacheLog() const
std::shared_ptr<S3QueueLog> Context::getS3QueueLog() const
{
auto lock = getLock();
auto lock = getGlobalSharedLock();
if (!shared->system_logs)
return {};

2
src/Storages/S3Queue/S3QueueFilesMetadata.cpp
View File

@ -591,11 +591,11 @@ void S3QueueFilesMetadata::setFileFailed(ProcessingNodeHolderPtr holder, const S
const auto node_name_with_retriable_suffix = node_name + ".retriable";
Coordination::Stat stat;
std::string res;
auto failed_node_metadata = NodeMetadata::fromString(res);
/// Extract the number of already done retries from node_hash.retriable node if it exists.
if (zk_client->tryGet(zookeeper_failed_path / node_name_with_retriable_suffix, res, &stat))
{
auto failed_node_metadata = NodeMetadata::fromString(res);
node_metadata.retries = failed_node_metadata.retries + 1;
std::lock_guard lock(file_status->metadata_lock);

2
src/Storages/S3Queue/S3QueueSource.cpp
View File

@ -148,7 +148,7 @@ Chunk StorageS3QueueSource::generate()
}
catch (const Exception & e)
{
LOG_ERROR(log, "Exception in chunk pulling: {} ", e.displayText());
LOG_ERROR(log, "Got an error while pulling chunk. Will set file {} as failed. Error: {} ", reader.getFile(), e.displayText());
files_metadata->setFileFailed(key_with_info->processing_holder, e.message());