grahamc/hydra2 - Change KPKXKDNGVWQSM5D5ODNWZBBQDE3YT32CEAWIEYND62P26XHPKGTAC

hydra-queue-runner: Fix assertion failure

It was hitting

assert(reservation.unique());

Since we do want the machine reservation to be released before calling wakeDispatcher(), let's use a different object for keeping track of active steps.

Created by Eelco Dolstra on November 2, 2016

KPKXKDNGVWQSM5D5ODNWZBBQDE3YT32CEAWIEYND62P26XHPKGTAC

Dependencies

In channels

main

Change contents

Replacement in src/hydra-queue-runner/builder.cc at line 16 [3.133]

B:BD[2.1] → [2.1:45]

    reservation->threadId = pthread_self();

[2.1]

[3.350]

    auto activeStep = std::make_shared<ActiveStep>();
    activeStep->step = reservation->step;
    activeStep->threadId = pthread_self();
    activeSteps_.lock()->insert(activeStep);

Deletion in src/hydra-queue-runner/builder.cc at line 21 [3.133]
B:BD[3.351] → [2.46:93]
```
    activeSteps_.lock()->insert(reservation);
```

Replacement in src/hydra-queue-runner/builder.cc at line 22 [3.133]

B:BD[2.130] → [2.130:215]

        reservation->threadId = -1;
        activeSteps_.lock()->erase(reservation);

[2.130]

[2.215]

        activeStep->threadId = -1;
        activeSteps_.lock()->erase(activeStep);

Deletion in src/hydra-queue-runner/state.hh at line 373 [5.1128]
B:BD[4.2908] → [2.4782:4846]
```
        pthread_t threadId = 0;
        bool cancelled = false;
```

Replacement in src/hydra-queue-runner/state.hh at line 377 [5.1128]

B:BD[2.4848] → [2.4848:4923]

    nix::Sync<std::set<std::shared_ptr<MachineReservation>>> activeSteps_;

[2.4848]

[6.1480]

    struct ActiveStep
    {
        Step::ptr step;
        pthread_t threadId;
    };

Insertion in src/hydra-queue-runner/state.hh at line 383 [5.1128]
[6.1481]
[6.1481]
```
    nix::Sync<std::set<std::shared_ptr<ActiveStep>>> activeSteps_;
```