Record the machine used for a build step

[?]
Jun 9, 2015, 12:57 PM
KBZHIGLGHGLST5AZZDEJTYBJSQNE2XYNHEN2FN6XMAMY5BJYZR6QC

Dependencies

  • [2] FQQRJUO4 Mark builds as busy
  • [3] NJJ7H64S Very basic multi-threaded queue runner
  • [4] 5AIYUMTB Basic remote building
  • [5] T2EIYJNG On SIGINT, shut down the builder threads
  • [6] YZAI5GQU Implement a database connection pool
  • [7] 24BMQDZA Start of single-process hydra-queue-runner
  • [8] ENXUSMSV Make concurrency more robust
  • [9] 62MQPRXC Pass null values to libpqxx properly

Change contents

  • replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 240
    [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.7389][3.6820:6911](),[3.6820][3.6820:6911]()
    BuildStepStatus status, const string & errorMsg = "", BuildID propagatedFrom = 0);
    [3.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.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.115][3.8465:8654](),[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)")
    [3.115]
    [3.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.343][3.343:390]()
    (startTime, status != bssBusy).exec();
    [3.343]
    [3.8996]
    (startTime, status != bssBusy)
    (machine, machine != "").exec();
  • replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 383
    [3.9554][3.9354:9436](),[3.9354][3.9354:9436]()
    BuildStepStatus status, const std::string & errorMsg, BuildID propagatedFrom)
    [3.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.413][3.9601:9757]()
    ("update BuildSteps set busy = 0, status = $1, propagatedFrom = $4, errorMsg = $5, startTime = $6, stopTime = $7 where build = $2 and stepnr = $3")
    [3.413]
    [3.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.535][3.9758:9796]()
    (startTime)(stopTime).exec();
    [3.535]
    [3.9821]
    (startTime)(stopTime)
    (machine, machine != "").exec();
  • replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 835
    [3.739][3.13301:13380](),[3.13380][2.455:456]()
    stepNr = createBuildStep(txn, result.startTime, build, step, bssBusy);
    [3.739]
    [2.456]
    stepNr = createBuildStep(txn, result.startTime, build, step, machine->sshName, bssBusy);
  • edit in src/hydra-queue-runner/hydra-queue-runner.cc at line 837
    [2.545][2.545:546]()
  • replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 885
    [3.16177][3.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.16702][3.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.16875][3.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);