grahamc/hydra2 - Change B7ENVLRS2KLKEG66TY5G4EW6M274JZOBDUCRB7BFBXLTBG455STQC

hydra-queue-runner: Make build notification more reliable

Previously, when hydra-queue-runner was restarted, any pending "build finished" notifications were lost. Now hydra-queue-runner marks finished but unnotified builds in the database and uses that to run pending notifications at startup.

Created by Eelco Dolstra on July 26, 2017

B7ENVLRS2KLKEG66TY5G4EW6M274JZOBDUCRB7BFBXLTBG455STQC

Dependencies

In channels

main

Change contents

Replacement in src/hydra-queue-runner/builder.cc at line 421 [7.133]

B:BD[7.12527] → [8.25:184]

                        ("update Builds set finished = 1, buildStatus = $2, startTime = $3, stopTime = $4, isCachedBuild = $5 where id = $1 and finished = 0")

[7.12527]

[7.12696]

                        ("update Builds set finished = 1, buildStatus = $2, startTime = $3, stopTime = $4, isCachedBuild = $5, notificationPendingSince = $4 where id = $1 and finished = 0")

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 417 [10.4840]

B:BD[9.600] → [8.185:358]

        ("update Builds set finished = 1, buildStatus = $2, startTime = $3, stopTime = $4, size = $5, closureSize = $6, releaseName = $7, isCachedBuild = $8 where id = $1")

[9.600]

[10.18032]

        ("update Builds set finished = 1, buildStatus = $2, startTime = $3, stopTime = $4, size = $5, closureSize = $6, releaseName = $7, isCachedBuild = $8, notificationPendingSince = $4 where id = $1")

Insertion in src/hydra-queue-runner/hydra-queue-runner.cc at line 522 [10.4840]

[6.178]

            if (item.type == NotificationItem::Type::BuildFinished) {
                auto conn(dbPool.get());
                pqxx::work txn(*conn);
                txn.parameterized
                    ("update Builds set notificationPendingSince = null where id = $1")
                    (item.id)
                    .exec();
                txn.commit();
            }

Insertion in src/hydra-queue-runner/hydra-queue-runner.cc at line 850 [10.4840]

[11.2824]

[4.387]

    /* Enqueue notification items for builds that were finished
       previously, but for which we didn't manage to send
       notifications. */
    {
        auto conn(dbPool.get());
        pqxx::work txn(*conn);
        auto res = txn.parameterized("select id from Builds where notificationPendingSince > 0").exec();
        for (auto const & row : res) {
            auto id = row["id"].as<BuildID>();
            enqueueNotificationItem({NotificationItem::Type::BuildFinished, id});
        }
    }

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 191 [7.20067]

B:BD[5.1990] → [5.1990:2144]

                    ("update Builds set finished = 1, buildStatus = $2, startTime = $3, stopTime = $3, isCachedBuild = 1 where id = $1 and finished = 0")

[5.1990]

[5.2144]

                    ("update Builds set finished = 1, buildStatus = $2, startTime = $3, stopTime = $3, isCachedBuild = 1, notificationPendingSince = $3 "
                     "where id = $1 and finished = 0")

Insertion in src/sql/hydra.sql at line 224 [14.1]
[12.2508]
[13.5210]
```
    notificationPendingSince integer,
```

Replacement in src/sql/hydra.sql at line 230 [14.1]

∅:D[2.143] → [15.11270:11530]

B:BD[13.5211] → [15.11270:11530]

    foreign key   (project) references Projects(name) on update cascade,
    foreign key   (project, jobset) references Jobsets(project, name) on update cascade,
    foreign key   (project, jobset, job) references Jobs(project, jobset, name) on update cascade

[2.143]

[16.2526]

    foreign key (project) references Projects(name) on update cascade,
    foreign key (project, jobset) references Jobsets(project, name) on update cascade,
    foreign key (project, jobset, job) references Jobs(project, jobset, name) on update cascade

Insertion in src/sql/hydra.sql at line 682 [14.1]

[3.105]


create index IndexBuildsOnNotificationPendingSince on Builds(notificationPendingSince) where notificationPendingSince is not null;

File addition: upgrade-55.sql (----------)

[17.3004]

alter table Builds add column notificationPendingSince integer;
create index IndexBuildsOnNotificationPendingSince on Builds(notificationPendingSince) where notificationPendingSince is not null;