grahamc/hydra2 - Change KBZHIGLGHGLST5AZZDEJTYBJSQNE2XYNHEN2FN6XMAMY5BJYZR6QC

Record the machine used for a build step

Created by Eelco Dolstra on June 9, 2015

KBZHIGLGHGLST5AZZDEJTYBJSQNE2XYNHEN2FN6XMAMY5BJYZR6QC

Dependencies

In channels

main

Change contents

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 240 [3.4840]

B:BD[3.6634] → [3.6634:6730]

        BuildStepStatus status, const std::string & errorMsg = "", BuildID propagatedFrom = 0);

[3.6634]

[3.6730]

        const std::string & machine, BuildStepStatus status, const std::string & errorMsg = "",
        BuildID propagatedFrom = 0);

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 244 [3.4840]

∅:D[4.7389] → [3.6820:6911]

B:BD[3.6820] → [3.6820:6911]

        BuildStepStatus status, const string & errorMsg = "", BuildID propagatedFrom = 0);

[4.7389]

[3.6911]

        const std::string & machine, BuildStepStatus status, const string & errorMsg = "",
        BuildID propagatedFrom = 0);

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 359 [3.4840]

B:BD[3.8172] → [3.8172:8254]

    BuildStepStatus status, const std::string & errorMsg, BuildID propagatedFrom)

[3.8172]

[3.8254]

    const std::string & machine, BuildStepStatus status, const std::string & errorMsg, BuildID propagatedFrom)

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 365 [3.4840]

∅:D[5.115] → [3.8465:8654]

B:BD[3.8465] → [3.8465:8654]

        ("insert into BuildSteps (build, stepnr, type, drvPath, busy, startTime, system, status, propagatedFrom, errorMsg, stopTime) values ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11)")

[5.115]

[5.116]

        ("insert into BuildSteps (build, stepnr, type, drvPath, busy, startTime, system, status, propagatedFrom, errorMsg, stopTime, machine) values ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12)")

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 370 [3.4840]

B:BD[5.343] → [5.343:390]

        (startTime, status != bssBusy).exec();

[5.343]

[3.8996]

        (startTime, status != bssBusy)
        (machine, machine != "").exec();

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 383 [3.4840]

∅:D[4.9554] → [3.9354:9436]

B:BD[3.9354] → [3.9354:9436]

    BuildStepStatus status, const std::string & errorMsg, BuildID propagatedFrom)

[4.9554]

[3.9436]

    const std::string & machine, BuildStepStatus status, const std::string & errorMsg, BuildID propagatedFrom)

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 388 [3.4840]

B:BD[5.413] → [4.9601:9757]

        ("update BuildSteps set busy = 0, status = $1, propagatedFrom = $4, errorMsg = $5, startTime = $6, stopTime = $7 where build = $2 and stepnr = $3")

[5.413]

[5.414]

        ("update BuildSteps set busy = 0, status = $1, propagatedFrom = $4, errorMsg = $5, startTime = $6, stopTime = $7, machine = $8 where build = $2 and stepnr = $3")

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 392 [3.4840]

B:BD[5.535] → [4.9758:9796]

        (startTime)(stopTime).exec();

[5.535]

[3.9821]

        (startTime)(stopTime)
        (machine, machine != "").exec();

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 835 [3.4840]

B:BD[6.739] → [4.13301:13380]

B:BD[4.13380] → [2.455:456]

        stepNr = createBuildStep(txn, result.startTime, build, step, bssBusy);

[6.739]

[2.456]

        stepNr = createBuildStep(txn, result.startTime, build, step, machine->sshName, bssBusy);

Deletion in src/hydra-queue-runner/hydra-queue-runner.cc at line 837 [3.4840]
B:BD[2.545] → [2.545:546]

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 885 [3.4840]

B:BD[3.16177] → [4.13855:13955]

            finishBuildStep(txn, result.startTime, result.stopTime, build->id, stepNr, bssSuccess);

[3.16177]

[3.16252]

            finishBuildStep(txn, result.startTime, result.stopTime, build->id, stepNr, machine->sshName, bssSuccess);

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 895 [3.4840]

B:BD[3.16702] → [4.14053:14169]

            finishBuildStep(txn, result.startTime, result.stopTime, build->id, stepNr, bssFailed, result.errorMsg);

[3.16702]

[3.16786]

            finishBuildStep(txn, result.startTime, result.stopTime, build->id, stepNr, machine->sshName, bssFailed, result.errorMsg);

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 899 [3.4840]

B:BD[3.16875] → [4.14170:14278]

                createBuildStep(txn, result.stopTime, build2, step, bssFailed, result.errorMsg, build->id);

[3.16875]

[3.16969]

                createBuildStep(txn, result.stopTime, build2, step, machine->sshName, bssFailed, result.errorMsg, build->id);