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

Distributed/DirectoryMonitor: protect metric_pending_files with metrics_lock

Browse Source 
Since there is local value, that is not atomic, anyway we already have
lock for metrics, so it is fine.
This commit is contained in:
Azat Khuzhin 2021-01-27 08:02:04 +03:00
parent cabe4ca1bb
commit 15f7459cae
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Storages/Distributed/DirectoryMonitor.cpp
View File

@ -453,8 +453,6 @@ std::map<UInt64, std::string> StorageDistributedDirectoryMonitor::getFiles() con
}
}
metric_pending_files.changeTo(files.size());
{
std::lock_guard metrics_lock(metrics_mutex);
@ -463,6 +461,7 @@ std::map<UInt64, std::string> StorageDistributedDirectoryMonitor::getFiles() con
if (bytes_count != new_bytes_count)
LOG_TRACE(log, "Bytes set to {} (was {})", new_bytes_count, bytes_count);
metric_pending_files.changeTo(files.size());
files_count = files.size();
bytes_count = new_bytes_count;
}
@ -911,14 +910,14 @@ void StorageDistributedDirectoryMonitor::markAsSend(const std::string & file_pat
{
Poco::File file(file_path);
size_t file_size = file.getSize();
{
std::lock_guard metrics_lock(metrics_mutex);
size_t file_size = file.getSize();
metric_pending_files.sub();
--files_count;
bytes_count -= file_size;
}
metric_pending_files.sub();
file.remove();
}