thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-13 09:52:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix

Browse Source
This commit is contained in:
Igor Mineev 2019-05-21 14:09:57 +03:00
parent f74b7331f5
commit 645ce7c9a4
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbms/src/Storages/MergeTree/DiskSpaceMonitor.cpp
View File

@ -237,7 +237,7 @@ SchemaSelector::SchemaSelector(const Poco::Util::AbstractConfiguration & config,
if (!std::all_of(name.begin(), name.end(), isWordCharASCII)) if (!std::all_of(name.begin(), name.end(), isWordCharASCII))
throw Exception("Schema name can contain only alphanumeric and '_' (" + name + ")", ErrorCodes::EXCESSIVE_ELEMENT_IN_CONFIG); throw Exception("Schema name can contain only alphanumeric and '_' (" + name + ")", ErrorCodes::EXCESSIVE_ELEMENT_IN_CONFIG);
schemas.emplace(name, Schema{config, config_prefix + "." + name, disks}); schemas.emplace(name, Schema{config, config_prefix + "." + name, disks});
LOG_INFO(logger, "Storage schema " << name << " Sloaded"); LOG_INFO(logger, "Storage schema " << name << " loaded");
} }
constexpr auto default_schema_name = "default"; constexpr auto default_schema_name = "default";

2
dbms/src/Storages/MergeTree/DiskSpaceMonitor.h
View File

@ -170,6 +170,8 @@ public:
{ {
/// Just make reservation if size is 0 /// Just make reservation if size is 0
if (size == 0) { if (size == 0) {
std::lock_guard lock(DiskSpaceMonitor::mutex);
reserves = &DiskSpaceMonitor::reserved[disk_ptr->getName()];
++reserves->reservation_count; ++reserves->reservation_count;
valid = true; valid = true;
return; return;