max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-23 06:26:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix RemoteStore pool deadlock in filterSource etc

Browse source
This commit is contained in:
Robert Hensing 2020-10-30 21:47:34 +01:00
parent dc5696b84f
commit 2192cac634
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -471,9 +471,14 @@ ref<const ValidPathInfo> RemoteStore::addCAToStore(
worker_proto::write(*this, conn->to, references); worker_proto::write(*this, conn->to, references);
conn->to << repair; conn->to << repair;
// The dump source may invoke the store, so we need to make some room.
connections->incCapacity();
{
Finally cleanup([&]() { connections->decCapacity(); });
conn.withFramedSink([&](Sink & sink) { conn.withFramedSink([&](Sink & sink) {
dump.drainInto(sink); dump.drainInto(sink);
}); });
}
auto path = parseStorePath(readString(conn->from)); auto path = parseStorePath(readString(conn->from));
return readValidPathInfo(conn, path); return readValidPathInfo(conn, path);