forked from lix-project/lix
RemoteStore::addCAToStore(): Don't hold connection while calling queryPathInfo()
This leads to a deadlock if we're at the connection limit.
This commit is contained in:
parent
5b107f2c5f
commit
980edd1f3a
|
@ -541,7 +541,8 @@ ref<const ValidPathInfo> RemoteStore::addCAToStore(
|
|||
const StorePathSet & references,
|
||||
RepairFlag repair)
|
||||
{
|
||||
auto conn(getConnection());
|
||||
std::optional<ConnectionHandle> conn_(getConnection());
|
||||
auto & conn = *conn_;
|
||||
|
||||
if (GET_PROTOCOL_MINOR(conn->daemonVersion) >= 25) {
|
||||
|
||||
|
@ -605,6 +606,8 @@ ref<const ValidPathInfo> RemoteStore::addCAToStore(
|
|||
}
|
||||
}, caMethod);
|
||||
auto path = parseStorePath(readString(conn->from));
|
||||
// Release our connection to prevent a deadlock in queryPathInfo().
|
||||
conn_.reset();
|
||||
return queryPathInfo(path);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue