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

Merge pull request #4207 from hercules-ci/fix-RemoteStore-filterSource-deadlock

Browse source 
Fix RemoteStore pool deadlock in filterSource etc
This commit is contained in:
Eelco Dolstra 2020-11-02 14:46:10 +01:00 committed by GitHub
parent db5424bf09 2192cac634
commit ab2ef851b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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

@ -473,9 +473,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);