grahamc/hydra - Change CUFVKLLAL54OHDMYUHVJZK46LLX7RJMUJUE5HWYDCGIOQ5TIGXZQC

Remove Hydra::Helper::nix::txn_do from the Perl code

To quote the function's comment:

Awful hack to handle timeouts in SQLite: just retry the transaction. DBD::SQLite has a 30 second retry window, but apparently it doesn't work.

Since SQLite is now dropped entirely, this wrapper can be removed completely.

Created by Maximilian Bosch on April 10, 2020

CUFVKLLAL54OHDMYUHVJZK46LLX7RJMUJUE5HWYDCGIOQ5TIGXZQC

Dependencies

In channels

upstream

main

Change contents

Replacement in src/lib/Hydra/Controller/API.pm at line 217 [11.24]
∅:D[9.91] → [10.297:339]
∅:D[7.151] → [10.297:339]
B:BD[10.297] → [10.297:339]
```
    txn_do($c->model('DB')->schema, sub {
```
[7.151]
[10.339]
```
    $c->model('DB')->schema->txn_do(sub {
```
Replacement in src/lib/Hydra/Controller/Admin.pm at line 93 [12.1]
B:BD[12.1919] → [12.1919:1961]
```
    txn_do($c->model('DB')->schema, sub {
```
[12.1892]
[12.1961]
```
    $c->model('DB')->schema->txn_do(sub {
```
Replacement in src/lib/Hydra/Controller/Build.pm at line 529 [15.1]
B:BD[13.379] → [14.86:128]
```
    txn_do($c->model('DB')->schema, sub {
```
[16.1]
[17.3773]
```
    $c->model('DB')->schema->txn_do(sub {
```
Replacement in src/lib/Hydra/Controller/Jobset.pm at line 65 [19.104]
B:BD[18.8225] → [18.8225:8271]
```
        txn_do($c->model('DB')->schema, sub {
```
[18.7995]
[18.8271]
```
        $c->model('DB')->schema->txn_do(sub {
```
Replacement in src/lib/Hydra/Controller/Jobset.pm at line 77 [19.104]
B:BD[18.9826] → [18.9826:9872]
```
        txn_do($c->model('DB')->schema, sub {
```
[18.9826]
[18.9872]
```
        $c->model('DB')->schema->txn_do(sub {
```
Replacement in src/lib/Hydra/Controller/Jobset.pm at line 103 [19.104]
B:BD[20.109] → [20.109:151]
```
    txn_do($c->model('DB')->schema, sub {
```
[20.109]
[21.259]
```
    $c->model('DB')->schema->txn_do(sub {
```
Replacement in src/lib/Hydra/Controller/JobsetEval.pm at line 149 [23.1302]
B:BD[22.410] → [22.410:452]
```
    txn_do($c->model('DB')->schema, sub {
```
[22.410]
[22.452]
```
    $c->model('DB')->schema->txn_do(sub {
```
Replacement in src/lib/Hydra/Controller/Project.pm at line 44 [25.1245]
∅:D[24.12] → [18.17085:17131]
B:BD[18.17085] → [18.17085:17131]
```
        txn_do($c->model('DB')->schema, sub {
```
[24.12]
[18.17131]
```
        $c->model('DB')->schema->txn_do(sub {
```
Replacement in src/lib/Hydra/Controller/Project.pm at line 58 [25.1245]
B:BD[18.18594] → [18.18594:18640]
```
        txn_do($c->model('DB')->schema, sub {
```
[18.18594]
[18.18640]
```
        $c->model('DB')->schema->txn_do(sub {
```
Replacement in src/lib/Hydra/Controller/Project.pm at line 80 [25.1245]
B:BD[25.2076] → [24.461:503]
```
    txn_do($c->model('DB')->schema, sub {
```
[25.2076]
[21.355]
```
    $c->model('DB')->schema->txn_do(sub {
```
Replacement in src/lib/Hydra/Controller/Project.pm at line 201 [25.1245]
B:BD[26.452] → [26.452:494]
```
    txn_do($c->model('DB')->schema, sub {
```
[26.452]
[26.494]
```
    $c->model('DB')->schema->txn_do(sub {
```
Replacement in src/lib/Hydra/Controller/Release.pm at line 66 [26.977]
∅:D[27.430] → [28.60:106]
B:BD[28.60] → [28.60:106]
```
        txn_do($c->model('DB')->schema, sub {
```
[27.430]
[28.106]
```
        $c->model('DB')->schema->txn_do(sub {
```
Replacement in src/lib/Hydra/Controller/Release.pm at line 72 [26.977]
B:BD[28.306] → [28.306:352]
```
        txn_do($c->model('DB')->schema, sub {
```
[28.306]
[28.352]
```
        $c->model('DB')->schema->txn_do(sub {
```
Replacement in src/lib/Hydra/Controller/User.pm at line 166 [29.252]
B:BD[29.2769] → [29.2769:2811]
```
    txn_do($c->model('DB')->schema, sub {
```
[29.2643]
[29.2811]
```
    $c->model('DB')->schema->txn_do(sub {
```
Replacement in src/lib/Hydra/Controller/User.pm at line 264 [29.252]
B:BD[30.2055] → [31.782:824]
```
    txn_do($c->model('DB')->schema, sub {
```
[30.2055]
[31.824]
```
    $c->model('Db')->schema->txn_do(sub {
```
Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 49 [33.2663]
B:BD[32.1280] → [32.1280:1302]
```
    txn_do($db, sub {
```
[32.1280]
[32.1302]
```
    $db->txn_do(sub {
```
Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 82 [33.2663]
B:BD[32.2344] → [32.2344:2370]
```
        txn_do($db, sub {
```
[32.2344]
[32.2370]
```
        $db->txn_do(sub {
```
Replacement in src/lib/Hydra/Helper/Nix.pm at line 17 [36.436]
B:BD[34.619] → [35.123:173]
```
    getHydraHome getHydraConfig getBaseUrl txn_do
```
[34.619]
[37.1502]
```
    getHydraHome getHydraConfig getBaseUrl
```

Deletion in src/lib/Hydra/Helper/Nix.pm at line 61 [36.436]

B:BD[35.287] → [35.287:291]

∅:D[35.291] → [14.588:781]

B:BD[38.53] → [14.588:781]

B:BD[14.781] → [39.1099:1112]

∅:D[39.1112] → [14.781:812]

B:BD[14.781] → [14.781:812]

B:BD[14.812] → [39.1113:1155]

∅:D[39.1155] → [14.847:858]

B:BD[14.847] → [14.847:858]

B:BD[14.858] → [39.1156:1184]

∅:D[39.1184] → [14.879:935]

B:BD[14.879] → [14.879:935]

}
# Awful hack to handle timeouts in SQLite: just retry the transaction.
# DBD::SQLite *has* a 30 second retry window, but apparently it
# doesn't work.
sub txn_do {
    my ($db, $coderef) = @_;
    my $res;
    while (1) {
        eval {
            $res = $db->txn_do($coderef);
        };
        return $res if !$@;
        die $@ unless $@ =~ "database is locked";
    }

Replacement in src/lib/Hydra/Helper/Nix.pm at line 433 [36.436]
B:BD[39.1236] → [39.1236:1265]
```
    return txn_do($db, sub {
```
[39.1236]
[2.0]
```
    return $db->txn_do(sub {
```
Replacement in src/lib/Hydra/Helper/Nix.pm at line 460 [36.436]
B:BD[40.1102] → [5.243:265]
```
    txn_do($db, sub {
```
[40.1102]
[41.274]
```
    $db->txn_do(sub {
```
Replacement in src/lib/Hydra/Plugin/BazaarInput.pm at line 61 [37.2135]
∅:D[4.173] → [37.4393:4427]
B:BD[37.4393] → [37.4393:4427]
```
        txn_do($self->{db}, sub {
```
[4.173]
[37.4427]
```
        $self->{db}->txn_do(sub {
```
Replacement in src/lib/Hydra/Plugin/DarcsInput.pm at line 80 [42.1]
B:BD[42.2988] → [42.2988:3022]
```
        txn_do($self->{db}, sub {
```
[42.2988]
[42.3022]
```
        $self->{db}->txn_do(sub {
```
Replacement in src/lib/Hydra/Plugin/GitInput.pm at line 221 [37.4877]
∅:D[4.347] → [37.9485:9519]
B:BD[37.9485] → [37.9485:9519]
```
        txn_do($self->{db}, sub {
```
[4.347]
[37.9519]
```
        $self->{db}->txn_do(sub {
```
Replacement in src/lib/Hydra/Plugin/MercurialInput.pm at line 88 [37.10685]
∅:D[4.520] → [37.12821:12855]
B:BD[37.12821] → [37.12821:12855]
```
        txn_do($self->{db}, sub {
```
[4.520]
[37.12855]
```
        $self->{db}->txn_do(sub {
```
Replacement in src/lib/Hydra/Plugin/PathInput.pm at line 57 [37.13415]
B:BD[37.15107] → [37.15107:15145]
```
            txn_do($self->{db}, sub {
```
[37.15107]
[37.15145]
```
            $self->{db}->txn_do(sub {
```
Replacement in src/lib/Hydra/Plugin/PathInput.pm at line 68 [37.13415]
B:BD[37.15553] → [37.15553:15591]
```
            txn_do($self->{db}, sub {
```
[37.15553]
[37.15591]
```
            $self->{db}->txn_do(sub {
```
Replacement in src/lib/Hydra/Plugin/SubversionInput.pm at line 74 [37.15903]
B:BD[37.18651] → [37.18651:18685]
```
        txn_do($self->{db}, sub {
```
[37.18651]
[37.18685]
```
        $self->{db}->txn_do(sub {
```
Replacement in src/script/hydra-create-user at line 57 [43.423]
B:BD[43.1850] → [43.1850:1868]
```
txn_do($db, sub {
```
[43.1850]
[43.1868]
```
$db->txn_do(sub {
```
Replacement in src/script/hydra-eval-jobset at line 402 [45.1319]
B:BD[44.13374] → [44.13374:13396]
```
    txn_do($db, sub {
```
[44.13374]
[8.0]
```
    $db->txn_do(sub {
```
Replacement in src/script/hydra-eval-jobset at line 504 [45.1319]
B:BD[46.3030] → [14.1416:1442]
```
        txn_do($db, sub {
```
[46.3030]
[47.770]
```
        $db->txn_do(sub {
```
Replacement in src/script/hydra-eval-jobset at line 606 [45.1319]
∅:D[3.84] → [47.1003:1029]
B:BD[47.1003] → [47.1003:1029]
```
        txn_do($db, sub {
```
[3.84]
[3.85]
```
        $db->txn_do(sub {
```
Replacement in src/script/hydra-eval-jobset at line 622 [45.1319]
∅:D[48.482] → [49.2449:2475]
∅:D[50.2019] → [49.2449:2475]
B:BD[49.2449] → [49.2449:2475]
```
        txn_do($db, sub {
```
[48.482]
[47.1145]
```
        $db->txn_do(sub {
```
Replacement in src/script/hydra-eval-jobset at line 663 [45.1319]
∅:D[6.18] → [14.1601:1623]
B:BD[51.6141] → [14.1601:1623]
```
    txn_do($db, sub {
```
[6.18]
[52.1439]
```
    $db->txn_do(sub {
```
Replacement in src/script/hydra-eval-jobset at line 809 [45.1319]
∅:D[3.269] → [14.1624:1650]
∅:D[47.1300] → [14.1624:1650]
∅:D[50.2998] → [14.1624:1650]
B:BD[53.2355] → [14.1624:1650]
```
        txn_do($db, sub {
```
[3.269]
[53.2381]
```
        $db->txn_do(sub {
```

Remove Hydra::Helper::nix::txn_do from the Perl code

Dependencies

In channels

Change contents

Replacement in src/lib/Hydra/Controller/API.pm at line 217 [11.24]

Replacement in src/lib/Hydra/Controller/Admin.pm at line 93 [12.1]

Replacement in src/lib/Hydra/Controller/Build.pm at line 529 [15.1]

Replacement in src/lib/Hydra/Controller/Jobset.pm at line 65 [19.104]

Replacement in src/lib/Hydra/Controller/Jobset.pm at line 77 [19.104]

Replacement in src/lib/Hydra/Controller/Jobset.pm at line 103 [19.104]

Replacement in src/lib/Hydra/Controller/JobsetEval.pm at line 149 [23.1302]

Replacement in src/lib/Hydra/Controller/Project.pm at line 44 [25.1245]

Replacement in src/lib/Hydra/Controller/Project.pm at line 58 [25.1245]

Replacement in src/lib/Hydra/Controller/Project.pm at line 80 [25.1245]

Replacement in src/lib/Hydra/Controller/Project.pm at line 201 [25.1245]

Replacement in src/lib/Hydra/Controller/Release.pm at line 66 [26.977]

Replacement in src/lib/Hydra/Controller/Release.pm at line 72 [26.977]

Replacement in src/lib/Hydra/Controller/User.pm at line 166 [29.252]

Replacement in src/lib/Hydra/Controller/User.pm at line 264 [29.252]

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 49 [33.2663]

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 82 [33.2663]

Replacement in src/lib/Hydra/Helper/Nix.pm at line 17 [36.436]

Deletion in src/lib/Hydra/Helper/Nix.pm at line 61 [36.436]

Replacement in src/lib/Hydra/Helper/Nix.pm at line 433 [36.436]

Replacement in src/lib/Hydra/Helper/Nix.pm at line 460 [36.436]

Replacement in src/lib/Hydra/Plugin/BazaarInput.pm at line 61 [37.2135]

Replacement in src/lib/Hydra/Plugin/DarcsInput.pm at line 80 [42.1]

Replacement in src/lib/Hydra/Plugin/GitInput.pm at line 221 [37.4877]

Replacement in src/lib/Hydra/Plugin/MercurialInput.pm at line 88 [37.10685]

Replacement in src/lib/Hydra/Plugin/PathInput.pm at line 57 [37.13415]

Replacement in src/lib/Hydra/Plugin/PathInput.pm at line 68 [37.13415]

Replacement in src/lib/Hydra/Plugin/SubversionInput.pm at line 74 [37.15903]

Replacement in src/script/hydra-create-user at line 57 [43.423]

Replacement in src/script/hydra-eval-jobset at line 402 [45.1319]

Replacement in src/script/hydra-eval-jobset at line 504 [45.1319]

Replacement in src/script/hydra-eval-jobset at line 606 [45.1319]

Replacement in src/script/hydra-eval-jobset at line 622 [45.1319]

Replacement in src/script/hydra-eval-jobset at line 663 [45.1319]

Replacement in src/script/hydra-eval-jobset at line 809 [45.1319]