lix-project/lix
20
55
Fork 31
Code Issues 344 Code Review (Gerrit) Projects 3 Releases Wiki Activity

RemoteStore::addCAToStore(): Don't hold connection while calling queryPathInfo()

Browse source 
This leads to a deadlock if we're at the connection limit.
This commit is contained in:
Eelco Dolstra 2020-09-22 15:28:20 +02:00
parent 5b107f2c5f
commit 980edd1f3a
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/libstore/remote-store.cc
View file

@ -541,7 +541,8 @@ ref<const ValidPathInfo> RemoteStore::addCAToStore(
const StorePathSet & references, const StorePathSet & references,
RepairFlag repair) RepairFlag repair)
{ {
auto conn(getConnection()); std::optional<ConnectionHandle> conn_(getConnection());
auto & conn = *conn_;
if (GET_PROTOCOL_MINOR(conn->daemonVersion) >= 25) { if (GET_PROTOCOL_MINOR(conn->daemonVersion) >= 25) {
@ -605,6 +606,8 @@ ref<const ValidPathInfo> RemoteStore::addCAToStore(
} }
}, caMethod); }, caMethod);
auto path = parseStorePath(readString(conn->from)); auto path = parseStorePath(readString(conn->from));
// Release our connection to prevent a deadlock in queryPathInfo().
conn_.reset();
return queryPathInfo(path); return queryPathInfo(path);
} }
} }