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

Fix RemoteStore pool deadlock in filterSource etc
2020-11-02 14:46:10 +01:00
parent db5424bf09 2192cac634
commit ab2ef851b6
1 changed files with 8 additions and 3 deletions
@@ -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);