Get rid of "will retry" messages after "maybe cancelling..."

Dependencies

• [2] 73YR46NJ hydra-queue-runner: Write directly to a binary cache
• [3] KQ3EGUQY Add some instrumentation to keep track of dispatcher cost
• [4] UYUVQWXQ Fix hydra-queue-runner --build-one
• [5] HJOEIMLR Refactor
• [6] EYR3EW6J Keep stats for the Hydra auto scaler
• [7] YR2IM6Y5 Temporarily disable machines after a connection failure
• [8] DKJFD6JN Process Nix API changes
• [9] FITVNQ2S Keep track of the time we spend copying to/from build machines
• [10] MHVIT4JY Split hydra-queue-runner.cc more
• [11] BRAESISH Warn if PostgreSQL appears stalled
• [12] OG3Z3QGC Namespace cleanup
• [13] N4IROACV Move buildRemote() into State

Change contents

• replacement in src/hydra-queue-runner/builder.cc at line 11
  [4.327]→[4.327:350](∅→∅)
  − bool retry = true;
  [4.327]

  [3.0]
  + StepResult res = sRetry;
• replacement in src/hydra-queue-runner/builder.cc at line 21
  [2.1193]→[2.1193:1261](∅→∅)
  − retry = doBuildStep(destStore, step, reservation->machine);
  [2.1193]

  [4.499]
  + res = doBuildStep(destStore, step, reservation->machine);
• replacement in src/hydra-queue-runner/builder.cc at line 34
  [4.940]→[4.940:967](∅→∅)
  − if (retry) {

  − {
  [4.940]

  [4.967]
  + if (res != sDone) {

  + if (res == sRetry) {
• replacement in src/hydra-queue-runner/builder.cc at line 50
  [4.1479]→[2.1262:1329](∅→∅)
  − bool State::doBuildStep(nix::ref<Store> destStore, Step::ptr step,
  [4.1479]

  [4.1552]
  + State::StepResult State::doBuildStep(nix::ref<Store> destStore, Step::ptr step,
• replacement in src/hydra-queue-runner/builder.cc at line 84
  [4.3012]→[4.3012:3037](∅→∅)
  − return true;
  [4.3012]

  [4.3037]
  + return sMaybeCancelled;
• replacement in src/hydra-queue-runner/builder.cc at line 177
  [4.5744]→[4.5744:5769](∅→∅)
  − return true;
  [4.5744]

  [4.5769]
  + return sRetry;
• replacement in src/hydra-queue-runner/builder.cc at line 403
  [4.14571]→[4.14571:14589](∅→∅)
  − return false;
  [4.14571]

  [4.14589]
  + return sDone;
• replacement in src/hydra-queue-runner/state.hh at line 428
  [4.8377]→[2.13560:13629](∅→∅),[4.1138]→[4.8447:8478](∅→∅),[4.1279]→[4.8447:8478](∅→∅),[2.13629]→[4.8447:8478](∅→∅),[4.8447]→[4.8447:8478](∅→∅)
  − bool doBuildStep(nix::ref<nix::Store> destStore, Step::ptr step,

  − Machine::ptr machine);
  [4.8377]

  [4.8478]
  + enum StepResult { sDone, sRetry, sMaybeCancelled };

  + StepResult doBuildStep(nix::ref<nix::Store> destStore,

  + Step::ptr step, Machine::ptr machine);