ahuston-0/hydra
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

hydra-queue-runner: Fix assertion failure

Browse Source 
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.
This commit is contained in:
Eelco Dolstra 2016-11-02 12:41:00 +01:00
parent 07decd6915
commit 4f08c85c69
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/hydra-queue-runner/builder.cc
View File

@ -13,13 +13,14 @@ void State::builder(MachineReservation::ptr reservation)
nrStepsStarted++; nrStepsStarted++;
reservation->threadId = pthread_self(); auto activeStep = std::make_shared<ActiveStep>();
activeStep->step = reservation->step;
activeSteps_.lock()->insert(reservation); activeStep->threadId = pthread_self();
activeSteps_.lock()->insert(activeStep);
Finally removeActiveStep([&]() { Finally removeActiveStep([&]() {
reservation->threadId = -1; activeStep->threadId = -1;
activeSteps_.lock()->erase(reservation); activeSteps_.lock()->erase(activeStep);
}); });
auto step = reservation->step; auto step = reservation->step;

10
src/hydra-queue-runner/state.hh
View File

@ -370,13 +370,17 @@ private:
State & state; State & state;
Step::ptr step; Step::ptr step;
Machine::ptr machine; Machine::ptr machine;
pthread_t threadId = 0;
bool cancelled = false;
MachineReservation(State & state, Step::ptr step, Machine::ptr machine); MachineReservation(State & state, Step::ptr step, Machine::ptr machine);
~MachineReservation(); ~MachineReservation();
}; };
nix::Sync<std::set<std::shared_ptr<MachineReservation>>> activeSteps_; struct ActiveStep
{
Step::ptr step;
pthread_t threadId;
};
nix::Sync<std::set<std::shared_ptr<ActiveStep>>> activeSteps_;
std::atomic<time_t> lastDispatcherCheck{0}; std::atomic<time_t> lastDispatcherCheck{0};