Use the BuildOptions more eagerly

NixOS · Mar 21, 2022 · 5153735 · 5153735
1 parent fab7cca
commit 5153735
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 25 deletions.
diff --git a/src/hydra-queue-runner/build-remote.cc b/src/hydra-queue-runner/build-remote.cc
@@ -269,12 +269,6 @@ StorePathSet sendInputs(
     return inputs;
 }
 
-struct BuildOptions {
-    unsigned int maxSilentTime, buildTimeout, repeats;
-    size_t maxLogSize;
-    bool enforceDeterminism;
-};
-
 void RemoteResult::updateWithBuildResult(const nix::BuildResult & buildResult)
 {
     RemoteResult thisArrow;
@@ -337,7 +331,7 @@ BuildResult performBuild(
     Store & localStore,
     StorePath drvPath,
     const BasicDerivation & drv,
-    const BuildOptions & options,
+    const State::BuildOptions & options,
     counter & nrStepsBuilding
 )
 {
@@ -472,7 +466,7 @@ void copyPathsFromRemote(
 
 void State::buildRemote(ref<Store> destStore,
     Machine::ptr machine, Step::ptr step,
-    unsigned int maxSilentTime, unsigned int buildTimeout, unsigned int repeats,
+    const BuildOptions & buildOptions,
     RemoteResult & result, std::shared_ptr<ActiveStep> activeStep,
     std::function<void(StepState)> updateStep,
     NarMemberDatas & narMembers)
@@ -523,7 +517,7 @@ void State::buildRemote(ref<Store> destStore,
         });
 
         try {
-          handshake(conn, repeats);
+          handshake(conn, buildOptions.repeats);
         } catch (EndOfFile & e) {
             child.pid.wait();
             string s = chomp(readFile(result.logFile));
@@ -567,13 +561,7 @@ void State::buildRemote(ref<Store> destStore,
             *localStore,
             step->drvPath,
             BasicDerivation(*step->drv),
-            {
-              .maxSilentTime = maxSilentTime,
-              .buildTimeout = buildTimeout,
-              .repeats = repeats,
-              .maxLogSize = maxLogSize,
-              .enforceDeterminism = step->isDeterministic,
-            },
+            buildOptions,
             nrStepsBuilding
         );
 

diff --git a/src/hydra-queue-runner/builder.cc b/src/hydra-queue-runner/builder.cc
@@ -98,8 +98,10 @@ State::StepResult State::doBuildStep(nix::ref<Store> destStore,
        it). */
     BuildID buildId;
     std::optional<StorePath> buildDrvPath;
-    unsigned int maxSilentTime, buildTimeout;
-    unsigned int repeats = step->isDeterministic ? 1 : 0;
+    BuildOptions buildOptions;
+    buildOptions.repeats = step->isDeterministic ? 1 : 0;
+    buildOptions.maxLogSize = maxLogSize;
+    buildOptions.enforceDeterminism = step->isDeterministic;
 
     auto conn(dbPool.get());
 
@@ -134,18 +136,18 @@ State::StepResult State::doBuildStep(nix::ref<Store> destStore,
             {
                 auto i = jobsetRepeats.find(std::make_pair(build2->projectName, build2->jobsetName));
                 if (i != jobsetRepeats.end())
-                    repeats = std::max(repeats, i->second);
+                    buildOptions.repeats = std::max(buildOptions.repeats, i->second);
             }
         }
         if (!build) build = *dependents.begin();
 
         buildId = build->id;
         buildDrvPath = build->drvPath;
-        maxSilentTime = build->maxSilentTime;
-        buildTimeout = build->buildTimeout;
+        buildOptions.maxSilentTime = build->maxSilentTime;
+        buildOptions.buildTimeout = build->buildTimeout;
 
         printInfo("performing step ‘%s’ %d times on ‘%s’ (needed by build %d and %d others)",
-            localStore->printStorePath(step->drvPath), repeats + 1, machine->sshName, buildId, (dependents.size() - 1));
+            localStore->printStorePath(step->drvPath), buildOptions.repeats + 1, machine->sshName, buildId, (dependents.size() - 1));
     }
 
     if (!buildOneDone)
@@ -206,7 +208,7 @@ State::StepResult State::doBuildStep(nix::ref<Store> destStore,
 
         try {
             /* FIXME: referring builds may have conflicting timeouts. */
-            buildRemote(destStore, machine, step, maxSilentTime, buildTimeout, repeats, result, activeStep, updateStep, narMembers);
+            buildRemote(destStore, machine, step, buildOptions, result, activeStep, updateStep, narMembers);
         } catch (Error & e) {
             if (activeStep->state_.lock()->cancelled) {
                 printInfo("marking step %d of build %d as cancelled", stepNr, buildId);

diff --git a/src/hydra-queue-runner/state.hh b/src/hydra-queue-runner/state.hh
@@ -447,6 +447,12 @@ private:
 public:
     State();
 
+    struct BuildOptions {
+        unsigned int maxSilentTime, buildTimeout, repeats;
+        size_t maxLogSize;
+        bool enforceDeterminism;
+    };
+
 private:
 
     nix::MaintainCount<counter> startDbUpdate();
@@ -531,8 +537,7 @@ private:
 
     void buildRemote(nix::ref<nix::Store> destStore,
         Machine::ptr machine, Step::ptr step,
-        unsigned int maxSilentTime, unsigned int buildTimeout,
-        unsigned int repeats,
+        const BuildOptions & buildOptions,
         RemoteResult & result, std::shared_ptr<ActiveStep> activeStep,
         std::function<void(StepState)> updateStep,
         NarMemberDatas & narMembers);