Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: db5424bf0988
Choose a base ref
...
head repository: NixOS/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ab2ef851b6db
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 30, 2020

  1. Fix RemoteStore pool deadlock in filterSource etc

    @roberth
    roberth committed Oct 30, 2020
    Copy the full SHA
    2192cac View commit details

Commits on Nov 2, 2020

  1. Merge pull request #4207 from hercules-ci/fix-RemoteStore-filterSourc… 

    …e-deadlock

Fix RemoteStore pool deadlock in filterSource etc
    @edolstra
    edolstra authored Nov 2, 2020
    Copy the full SHA
    ab2ef85 View commit details
Showing with 8 additions and 3 deletions.
  1. +8 −3 src/libstore/remote-store.cc
11 changes: 8 additions & 3 deletions src/libstore/remote-store.cc
View file
Original file line number Diff line number Diff line change
@@ -473,9 +473,14 @@ ref<const ValidPathInfo> RemoteStore::addCAToStore(
worker_proto::write(*this, conn->to, references);
conn->to << repair;

conn.withFramedSink([&](Sink & sink) {
dump.drainInto(sink);
});
// The dump source may invoke the store, so we need to make some room.
connections->incCapacity();
{
Finally cleanup([&]() { connections->decCapacity(); });
conn.withFramedSink([&](Sink & sink) {
dump.drainInto(sink);
});
}

auto path = parseStorePath(readString(conn->from));
return readValidPathInfo(conn, path);