grahamc/hydra - Change FJCKDJKBQ3KRQEAQ2GX2HIPLA3NEXBJ4BB4MA6PYDEW7ZRHWAZJQC

Acquire the send lock only while actually sending

Thus, we no longer hold the send lock while substituting missing paths on the build machine. This is a good thing in particular for macOS builders which have a tendency to hang forever in curl downloads.

Created by Eelco Dolstra on September 1, 2017

FJCKDJKBQ3KRQEAQ2GX2HIPLA3NEXBJ4BB4MA6PYDEW7ZRHWAZJQC

Dependencies

In channels

upstream

main

Change contents

Replacement in src/hydra-queue-runner/build-remote.cc at line 80 [3.85]

B:BD[3.1290] → [4.123:171]

static void copyClosureTo(ref<Store> destStore,

[3.1290]

[3.1349]

static void copyClosureTo(std::timed_mutex & sendMutex, ref<Store> destStore,

Insertion in src/hydra-queue-runner/build-remote.cc at line 110 [3.85]

[5.286]

[6.65]

    std::unique_lock<std::timed_mutex> sendLock(sendMutex,
        std::chrono::seconds(600));

Deletion in src/hydra-queue-runner/build-remote.cc at line 235 [3.85]

B:BD[7.2711] → [2.0:127]

            std::unique_lock<std::timed_mutex> sendLock(
                machine->state->sendLock, std::chrono::seconds(600));

Replacement in src/hydra-queue-runner/build-remote.cc at line 241 [3.85]

B:BD[8.56] → [7.3041:3103]

            copyClosureTo(destStore, from, to, inputs, true);

[8.56]

[8.57]

            copyClosureTo(machine->state->sendLock, destStore, from, to, inputs, true);