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

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

11
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;
conn.withFramedSink([&](Sink & sink) { // The dump source may invoke the store, so we need to make some room.
dump.drainInto(sink); connections->incCapacity();
}); {
Finally cleanup([&]() { connections->decCapacity(); });
conn.withFramedSink([&](Sink & sink) {
dump.drainInto(sink);
});
}
auto path = parseStorePath(readString(conn->from)); auto path = parseStorePath(readString(conn->from));
return readValidPathInfo(conn, path); return readValidPathInfo(conn, path);