api: fix github webhook

Co-authored-by: Charlotte <lotte@chir.rs>

src/hydra-queue-runner/builder.cc

@@ -35,18 +35,10 @@ void State::builder(MachineReservation::ptr reservation)
             activeSteps_.lock()->erase(activeStep);
         });
 
-        auto conn(dbPool.get());
-
         try {
             auto destStore = getDestStore();
             // Might release the reservation.
-            res = doBuildStep(destStore, reservation, *conn, activeStep);
-        } catch (pqxx::broken_connection & e) {
-            printMsg(lvlError, "db lost while building ‘%s’ on ‘%s’: %s (retriable)",
-                localStore->printStorePath(activeStep->step->drvPath),
-                reservation ? reservation->machine->sshName : std::string("(no machine)"),
-                e.what());
-            conn.markBad();
+            res = doBuildStep(destStore, reservation, activeStep);
         } catch (std::exception & e) {
             printMsg(lvlError, "uncaught exception building ‘%s’ on ‘%s’: %s",
                 localStore->printStorePath(activeStep->step->drvPath),
@@ -84,7 +76,6 @@ void State::builder(MachineReservation::ptr reservation)
 
 State::StepResult State::doBuildStep(nix::ref<Store> destStore,
     MachineReservation::ptr & reservation,
-    Connection & conn,
     std::shared_ptr<ActiveStep> activeStep)
 {
     auto step(reservation->step);
@@ -115,6 +106,8 @@ State::StepResult State::doBuildStep(nix::ref<Store> destStore,
     buildOptions.maxLogSize = maxLogSize;
     buildOptions.enforceDeterminism = step->isDeterministic;
 
+    auto conn(dbPool.get());
+
     {
         std::set<Build::ptr> dependents;
         std::set<Step::ptr> steps;
@@ -139,7 +132,7 @@ State::StepResult State::doBuildStep(nix::ref<Store> destStore,
         for (auto build2 : dependents) {
             if (build2->drvPath == step->drvPath) {
                 build = build2;
-                pqxx::work txn(conn);
+                pqxx::work txn(*conn);
                 notifyBuildStarted(txn, build->id);
                 txn.commit();
             }
@@ -194,7 +187,7 @@ State::StepResult State::doBuildStep(nix::ref<Store> destStore,
 
     /* If any of the outputs have previously failed, then don't bother
        building again. */
-    if (checkCachedFailure(step, conn))
+    if (checkCachedFailure(step, *conn))
         result.stepStatus = bsCachedFailure;
     else {
 
@@ -202,13 +195,13 @@ State::StepResult State::doBuildStep(nix::ref<Store> destStore,
            building. */
         {
             auto mc = startDbUpdate();
-            pqxx::work txn(conn);
+            pqxx::work txn(*conn);
             stepNr = createBuildStep(txn, result.startTime, buildId, step, machine->sshName, bsBusy);
             txn.commit();
         }
 
         auto updateStep = [&](StepState stepState) {
-            pqxx::work txn(conn);
+            pqxx::work txn(*conn);
             updateBuildStep(txn, buildId, stepNr, stepState);
             txn.commit();
         };
@@ -259,7 +252,7 @@ State::StepResult State::doBuildStep(nix::ref<Store> destStore,
 
     /* Finish the step in the database. */
     if (stepNr) {
-        pqxx::work txn(conn);
+        pqxx::work txn(*conn);
         finishBuildStep(txn, result, buildId, stepNr, machine->sshName);
         txn.commit();
     }
@@ -335,7 +328,7 @@ State::StepResult State::doBuildStep(nix::ref<Store> destStore,
             {
                 auto mc = startDbUpdate();
 
-                pqxx::work txn(conn);
+                pqxx::work txn(*conn);
 
                 for (auto & b : direct) {
                     printInfo("marking build %1% as succeeded", b->id);
@@ -363,7 +356,7 @@ State::StepResult State::doBuildStep(nix::ref<Store> destStore,
         /* Send notification about the builds that have this step as
            the top-level. */
         {
-            pqxx::work txn(conn);
+            pqxx::work txn(*conn);
             for (auto id : buildIDs)
                 notifyBuildFinished(txn, id, {});
             txn.commit();
@@ -392,7 +385,7 @@ State::StepResult State::doBuildStep(nix::ref<Store> destStore,
         }
 
     } else
-        failStep(conn, step, buildId, result, machine, stepFinished);
+        failStep(*conn, step, buildId, result, machine, stepFinished);
 
     // FIXME: keep stats about aborted steps?
     nrStepsDone++;

src/hydra-queue-runner/state.hh

@@ -594,7 +594,6 @@ private:
     enum StepResult { sDone, sRetry, sMaybeCancelled };
     StepResult doBuildStep(nix::ref<nix::Store> destStore,
         MachineReservation::ptr & reservation,
-        Connection & conn,
         std::shared_ptr<ActiveStep> activeStep);
 
     void buildRemote(nix::ref<nix::Store> destStore,