grahamc/hydra - Change CHQEG6WY44VSOTLNH5KDZWJCCHNHRUCX6BEREXUUO56VOKHNSUZAC

Hydra/29: Added timeout to svn/git checkouts, job evaluation

Created by Rob Vermaas on May 18, 2010

CHQEG6WY44VSOTLNH5KDZWJCCHNHRUCX6BEREXUUO56VOKHNSUZAC

Dependencies

In channels

upstream

main

Change contents

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 161 [5.2663]

∅:D[3.257] → [4.3046:3155]

B:BD[4.3046] → [4.3046:3155]

        (my $res, $stdout, $stderr) = captureStdoutStderr(
            "nix-prefetch-svn", $uri, $revision);

[3.257]

[4.3155]

        (my $res, $stdout, $stderr) = captureStdoutStderr(600,
            ("nix-prefetch-svn", $uri, $revision));

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 278 [5.2663]

B:BD[6.120] → [6.120:175]

B:BD[6.175] → [2.0:58]

    (my $res, $stdout, $stderr) = captureStdoutStderr(
        "git", "ls-remote", $uri, "refs/heads/".$branch);

[6.120]

[6.216]

    (my $res, $stdout, $stderr) = captureStdoutStderr(600,
        ("git", "ls-remote", $uri, "refs/heads/".$branch));

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 320 [5.2663]

B:BD[7.948] → [4.7420:7529]

        (my $res, $stdout, $stderr) = captureStdoutStderr(
            "nix-prefetch-git", $uri, $revision);

[7.948]

[4.7529]

        (my $res, $stdout, $stderr) = captureStdoutStderr(600,
            ("nix-prefetch-git", $uri, $revision));

Deletion in src/lib/Hydra/Helper/AddBuilds.pm at line 429 [5.2663]
B:BD[8.2296] → [8.2296:2297]

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 430 [5.2663]

B:BD[8.2323] → [8.2323:2467]

∅:D[8.2467] → [5.10397:10399]

B:BD[5.10397] → [5.10397:10399]

    my $stdin = ""; my $stdout; my $stderr;
    my $res = IPC::Run::run(\@_, \$stdin, \$stdout, \$stderr);
    return ($res, $stdout, $stderr);
}

[8.2323]

[8.2468]

    (my $timeout, my @cmd) = @_;
    my $res;
    my $stdin = "";
    my $stdout;
    my $stderr;
    eval {
        local $SIG{ALRM} = sub { die "timeout\n" }; # NB: \n required
        alarm $timeout;

Insertion in src/lib/Hydra/Helper/AddBuilds.pm at line 440 [5.2663]

[8.2469]

        $res = IPC::Run::run(\@cmd, \$stdin, \$stdout, \$stderr);
        alarm 0;
     };
     if ($@) {
        die unless $@ eq "timeout\n";   # propagate unexpected errors
        return (undef, undef, undef);
     } else {
         return ($res, $stdout, $stderr);
     }
}

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 461 [5.2663]

B:BD[8.2918] → [8.2918:3093]

    (my $res, my $jobsXml, my $stderr) = captureStdoutStderr(
        "hydra_eval_jobs", $nixExprFullPath, "--gc-roots-dir", getGCRootsDir,
        inputsToArgs($inputInfo));

[8.2918]

[8.3093]

    (my $res, my $jobsXml, my $stderr) = captureStdoutStderr(10800,
        ("hydra_eval_jobs", $nixExprFullPath, "--gc-roots-dir", getGCRootsDir, inputsToArgs($inputInfo)));