mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-04-22 17:40:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

db/legacy_schema_tables: Fix dead lock in create table statement

Browse Source 
merge_schema() was recursively calling itself, causing it to block
iself on a non-recursive lock.
This commit is contained in:
Tomasz Grabiec
2015-07-23 12:26:23 +02:00
parent e41880fc66
commit 3fd682de4b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
db/legacy_schema_tables.cc
View File

@@ -512,7 +512,7 @@ future<> save_system_keyspace_schema() {
future<> merge_schema(service::storage_proxy& proxy, std::vector<mutation> mutations, bool do_flush)
{
return merge_lock().then([&proxy, mutations = std::move(mutations), do_flush] {
return merge_schema(proxy, std::move(mutations), do_flush);
return do_merge_schema(proxy, std::move(mutations), do_flush);
}).finally([] {
return merge_unlock();
});