grahamc/hydra2 - Change ZTQEU5QSAJYC66QQABJLVR7EEZWEIW6UMQMSIEP2KRZH5PGEB53QC

Hydra: Add support for maxSilent meta attribute (also already added timeout, but not implemented the actual timeout for the build yet)

Created by Rob Vermaas on May 26, 2010

ZTQEU5QSAJYC66QQABJLVR7EEZWEIW6UMQMSIEP2KRZH5PGEB53QC

Dependencies

In channels

main

Change contents

Insertion in src/c/hydra_eval_jobs.cc at line 129 [5.303]
[4.1131]
[4.1131]

Insertion in src/c/hydra_eval_jobs.cc at line 132 [5.303]

[4.1269]

[6.0]


            int timeout = queryMetaFieldInt(meta, "timeout", 36000);
            xmlAttrs["timeout"] = int2String(timeout);

Insertion in src/c/hydra_eval_jobs.cc at line 136 [5.303]

[6.1]

            int maxsilent = queryMetaFieldInt(meta, "maxSilent", 3600);
            xmlAttrs["maxSilent"] = int2String(maxsilent);

Insertion in src/lib/Hydra/Helper/AddBuilds.pm at line 544 [8.2663]

[7.5581]

            , maxsilent => $buildInfo->{maxSilent}
            , timeout => $buildInfo->{timeout}

Insertion in src/lib/Hydra/Schema/Builds.pm at line 128 [10.5202]

[9.8491]

  is_nullable: 1
  size: undef
=head2 maxsilent
  data_type: integer
  default_value: 3600
  is_nullable: 1
  size: undef
=head2 timeout
  data_type: integer
  default_value: 36000

Insertion in src/lib/Hydra/Schema/Builds.pm at line 275 [10.5202]

[11.8758]

    is_nullable => 1,
    size => undef,
  },
  "maxsilent",
  {
    data_type => "integer",
    default_value => 3600,
    is_nullable => 1,
    size => undef,
  },
  "timeout",
  {
    data_type => "integer",
    default_value => 36000,

Replacement in src/lib/Hydra/Schema/Builds.pm at line 466 [10.5202]

B:BD[3.1182] → [3.1182:1324]

# Created by DBIx::Class::Schema::Loader v0.05000 @ 2010-03-05 13:07:46
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:sE2/zTcfETC8Eahh6NQDZA

[3.1182]

[3.1324]

# Created by DBIx::Class::Schema::Loader v0.05000 @ 2010-05-26 09:25:50
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:OApfteImw84nYhUvSUB4FA

Insertion in src/root/build.tt at line 276 [10.7350]

[12.9366]

		  </tr>
		  <tr>
		    <th>Max silent / timeout:</th>
		    <td>[% build.maxsilent %]s / [% build.timeout %]s</td>

Replacement in src/script/hydra_build.pl at line 212 [13.2912]

B:BD[13.3230] → [14.7367:7437]

    my $drvPath = $build->drvpath;
    my $outPath = $build->outpath;

[13.3230]

[13.3296]

    my $drvPath   = $build->drvpath;
    my $outPath   = $build->outpath;
    my $maxsilent = $build->maxsilent;
    my $timeout   = $build->timeout;

Replacement in src/script/hydra_build.pl at line 239 [13.2912]

B:BD[2.52] → [2.52:116]

            "--max-silent-time 3600 --keep-going --fallback " .

[2.52]

[2.116]

            "--max-silent-time $maxsilent --keep-going --fallback " .

Insertion in src/sql/hydra.sql at line 146 [16.1]

[11.18121]

[15.5867]

    maxsilent     integer default 3600, -- meta.maxsilent
    timeout       integer default 36000, -- meta.timeout