grahamc/hydra2 - Change RND7XFNHXVORJ6JPEHGS7PCIW7DMOTWMZQPTEMXWLR7CZUQ2VCQQC

getQueuedBuilds(): Periodically stop to handle priority bumps

Previously, priority bumps could take a long time to get noticed if getQueuedBuilds() was busy processing zillions of queue additions. (This was made worse by the reintroduction of substitute checking.)

Created by Eelco Dolstra on October 22, 2015

RND7XFNHXVORJ6JPEHGS7PCIW7DMOTWMZQPTEMXWLR7CZUQ2VCQQC

Dependencies

In channels

main

Change contents

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 39 [3.20067]

B:BD[3.20820] → [3.20820:20872]

        getQueuedBuilds(*conn, store, lastBuildId);

[3.20820]

[3.20872]

        bool done = getQueuedBuilds(*conn, store, lastBuildId);

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 43 [3.20067]

B:BD[3.20964] → [3.20964:21026]

        conn->await_notification();
        nrQueueWakeups++;

[3.20964]

[3.21026]

        if (done) {
            conn->await_notification();
            nrQueueWakeups++;
        } else
            conn->get_notifs();

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 67 [3.20067]

B:BD[3.21512] → [3.21512:21620]

void State::getQueuedBuilds(Connection & conn, std::shared_ptr<StoreAPI> store, unsigned int & lastBuildId)

[3.21512]

[3.21620]

bool State::getQueuedBuilds(Connection & conn, std::shared_ptr<StoreAPI> store, unsigned int & lastBuildId)

Insertion in src/hydra-queue-runner/queue-monitor.cc at line 76 [3.20067]
[2.132]
[3.21893]
```
    unsigned int newLastBuildId = lastBuildId;
```

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 91 [3.20067]

B:BD[3.22293] → [3.22293:22345]

            if (id > lastBuildId) lastBuildId = id;

[3.22293]

[3.22345]

            if (id > newLastBuildId) newLastBuildId = id;

Insertion in src/hydra-queue-runner/queue-monitor.cc at line 237 [3.20067]
[3.27972]
[2.839]
```
    system_time start = std::chrono::system_clock::now();
```

Insertion in src/hydra-queue-runner/queue-monitor.cc at line 260 [3.20067]

[3.28655]


        /* Stop after a certain time to allow priority bumps to be
           processed. */
        if (std::chrono::system_clock::now() > start + std::chrono::seconds(600)) break;

Insertion in src/hydra-queue-runner/queue-monitor.cc at line 265 [3.20067]

[3.28661]


    lastBuildId = newBuildsByID.empty() ? newLastBuildId : newBuildsByID.begin()->first - 1;
    return newBuildsByID.empty();

Replacement in src/hydra-queue-runner/state.hh at line 380 [6.1128]

∅:D[4.2260] → [5.764:875]

B:BD[6.7626] → [5.764:875]

    void getQueuedBuilds(Connection & conn, std::shared_ptr<nix::StoreAPI> store, unsigned int & lastBuildId);

[4.2260]

[6.7732]

    bool getQueuedBuilds(Connection & conn, std::shared_ptr<nix::StoreAPI> store, unsigned int & lastBuildId);