WIP ssh-ng://

We need a replacement for the nar member logic, however. And maybe also
a test that fails until this is fixed (this one should not be passing).

.gitignore

@@ -3,7 +3,6 @@
 /src/sql/hydra-postgresql.sql
 /src/sql/hydra-sqlite.sql
 /src/sql/tmp.sqlite
-.hydra-data
 result
 result-*
 outputs

README.md

@@ -72,16 +72,17 @@ Make sure **State** at the top of the page is set to "_Enabled_" and click on "_
 You can build Hydra via `nix-build` using the provided [default.nix](./default.nix):
 
 ```
-$ nix build
+$ nix-build
 ```
 
 ### Development Environment
 
 You can use the provided shell.nix to get a working development environment:
 ```
-$ nix develop
-$ mesonConfigurePhase
-$ ninja
+$ nix-shell
+$ autoreconfPhase
+$ configurePhase # NOTE: not ./configure
+$ make
 ```
 
 ### Executing Hydra During Development
@@ -90,9 +91,9 @@ When working on new features or bug fixes you need to be able to run Hydra from
 can be done using [foreman](https://github.com/ddollar/foreman):
 
 ```
-$ nix develop
+$ nix-shell
 $ # hack hack
-$ ninja -C build
+$ make
 $ foreman start
 ```
 
@@ -114,24 +115,22 @@ Start by following the steps in [Development Environment](#development-environme
 Then, you can run the tests and the perlcritic linter together with:
 
 ```console
-$ nix develop
-$ ninja -C build test
+$ nix-shell
+$ make check
 ```
 
 You can run a single test with:
 
 ```
-$ nix develop
-$ cd build
-$ meson test --test-args=../t/Hydra/Event.t testsuite
+$ nix-shell
+$ yath test ./t/foo/bar.t
 ```
 
 And you can run just perlcritic with:
 
 ```
-$ nix develop
-$ cd build
-$ meson test perlcritic
+$ nix-shell
+$ make perlcritic
 ```
 
 ### JSON API

doc/manual/src/hacking.md

@@ -11,6 +11,12 @@ $ cd hydra
 To enter a shell in which all environment variables (such as `PERL5LIB`)
 and dependencies can be found:
 
+```console
+$ nix-shell
+```
+
+of when flakes are enabled:
+
 ```console
 $ nix develop
 ```
@@ -18,15 +24,15 @@ $ nix develop
 To build Hydra, you should then do:
 
 ```console
-$ mesonConfigurePhase
-$ ninja
+[nix-shell]$ autoreconfPhase
+[nix-shell]$ configurePhase
+[nix-shell]$ make -j$(nproc)
 ```
 
 You start a local database, the webserver, and other components with
 foreman:
 
 ```console
-$ ninja -C build
 $ foreman start
 ```
 
@@ -41,11 +47,18 @@ $ ./src/script/hydra-server
 You can run Hydra's test suite with the following:
 
 ```console
-$ meson test
-# to run as many tests as you have cores:
-$ YATH_JOB_COUNT=$NIX_BUILD_CORES meson test
+[nix-shell]$ make check
+[nix-shell]$ # to run as many tests as you have cores:
+[nix-shell]$ make check YATH_JOB_COUNT=$NIX_BUILD_CORES
+[nix-shell]$ # or run yath directly:
+[nix-shell]$ yath test
+[nix-shell]$ # to run as many tests as you have cores:
+[nix-shell]$ yath test -j $NIX_BUILD_CORES
 ```
 
+When using `yath` instead of `make check`, ensure you have run `make`
+in the root of the repository at least once.
+
 **Warning**: Currently, the tests can fail
 if run with high parallelism [due to an issue in
 `Test::PostgreSQL`](https://github.com/TJC/Test-postgresql/issues/40)
@@ -62,7 +75,7 @@ will reload the page every time you save.
 To build Hydra and its dependencies:
 
 ```console
-$ nix build .#packages.x86_64-linux.default
+$ nix-build release.nix -A build.x86_64-linux
 ```
 
 ## Development Tasks

flake.lock

@@ -5,6 +5,7 @@
         "flake-compat": [],
         "flake-parts": [],
         "git-hooks-nix": [],
+        "nixfmt": [],
         "nixpkgs": [
           "nixpkgs"
         ],
@@ -12,16 +13,16 @@
         "nixpkgs-regression": []
       },
       "locked": {
-        "lastModified": 1739899400,
-        "narHash": "sha256-q/RgA4bB7zWai4oPySq9mch7qH14IEeom2P64SXdqHs=",
+        "lastModified": 1739571938,
+        "narHash": "sha256-NlaLAed/xei6RWpU2HIIbDjILRC4l1NIfGeyrn7ALQs=",
         "owner": "NixOS",
         "repo": "nix",
-        "rev": "e310c19a1aeb1ce1ed4d41d5ab2d02db596e0918",
+        "rev": "ffc649d2eabdd3e678b5bcc211dd59fd06debf3e",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "2.26-maintenance",
+        "ref": "ssh-ng-extensions-for-hydra",
         "repo": "nix",
         "type": "github"
       }
@@ -29,15 +30,16 @@
     "nix-eval-jobs": {
       "flake": false,
       "locked": {
-        "lastModified": 1743008255,
-        "narHash": "sha256-Lo4KFBNcY8tmBuCmEr2XV0IUZtxXHmbXPNLkov/QSU0=",
-        "owner": "nix-community",
+        "lastModified": 1739499741,
+        "narHash": "sha256-dNMJY6+G3PwE8lIAhwetPJdA2DxCEKRXPY/EtHmdDh4=",
+        "owner": "Ericson2314",
         "repo": "nix-eval-jobs",
-        "rev": "f7418fc1fa45b96d37baa95ff3c016dd5be3876b",
+        "rev": "de345eb4518d952c2d86261b270f2c31edecd3de",
         "type": "github"
       },
       "original": {
-        "owner": "nix-community",
+        "owner": "Ericson2314",
+        "ref": "nix-2.27",
         "repo": "nix-eval-jobs",
         "type": "github"
       }

flake.nix

@@ -4,7 +4,7 @@
   inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11-small";
 
   inputs.nix = {
-    url = "github:NixOS/nix/2.26-maintenance";
+    url = "github:NixOS/nix/ssh-ng-extensions-for-hydra";
     inputs.nixpkgs.follows = "nixpkgs";
 
     # hide nix dev tooling from our lock file
@@ -13,10 +13,11 @@
     inputs.nixpkgs-regression.follows = "";
     inputs.nixpkgs-23-11.follows = "";
     inputs.flake-compat.follows = "";
+    inputs.nixfmt.follows = "";
   };
 
   inputs.nix-eval-jobs = {
-    url = "github:nix-community/nix-eval-jobs";
+    url = "github:Ericson2314/nix-eval-jobs/nix-2.27";
     # We want to control the deps precisely
     flake = false;
   };

nixos-modules/default.nix

@@ -15,6 +15,7 @@
     systemd.services.hydra-send-stats.enable = false;
 
     services.postgresql.enable = true;
+    services.postgresql.package = pkgs.postgresql_12;
 
     # The following is to work around the following error from hydra-server:
     #   [error] Caught exception in engine "Cannot determine local time zone"

nixos-modules/hydra.nix

@@ -468,7 +468,7 @@ in
             elif [[ $compression == zstd ]]; then
               compression="zstd --rm"
             fi
-            find ${baseDir}/build-logs -ignore_readdir_race -type f -name "*.drv" -mtime +3 -size +0c | xargs -r "$compression" --force --quiet
+            find ${baseDir}/build-logs -type f -name "*.drv" -mtime +3 -size +0c | xargs -r "$compression" --force --quiet
           '';
         startAt = "Sun 01:45";
       };

package.nix

@@ -241,7 +241,7 @@ stdenv.mkDerivation (finalAttrs: {
   shellHook = ''
     pushd $(git rev-parse --show-toplevel) >/dev/null
 
-    PATH=$(pwd)/build/src/hydra-evaluator:$(pwd)/build/src/script:$(pwd)/build/src/hydra-queue-runner:$PATH
+    PATH=$(pwd)/src/hydra-evaluator:$(pwd)/src/script:$(pwd)/src/hydra-queue-runner:$PATH
     PERL5LIB=$(pwd)/src/lib:$PERL5LIB
     export HYDRA_HOME="$(pwd)/src/"
     mkdir -p .hydra-data

src/hydra-queue-runner/build-remote.cc

@@ -7,15 +7,12 @@
 
 #include "build-result.hh"
 #include "path.hh"
-#include "legacy-ssh-store.hh"
+#include "ssh-store.hh"
 #include "serve-protocol.hh"
-#include "serve-protocol-impl.hh"
 #include "state.hh"
 #include "current-process.hh"
 #include "processes.hh"
 #include "util.hh"
-#include "serve-protocol.hh"
-#include "serve-protocol-impl.hh"
 #include "ssh.hh"
 #include "finally.hh"
 #include "url.hh"
@@ -39,108 +36,6 @@ bool ::Machine::isLocalhost() const
 
 namespace nix::build_remote {
 
-static std::unique_ptr<SSHMaster::Connection> openConnection(
-    ::Machine::ptr machine, SSHMaster & master)
-{
-    Strings command = {"nix-store", "--serve", "--write"};
-    if (machine->isLocalhost()) {
-        command.push_back("--builders");
-        command.push_back("");
-    } else {
-        auto remoteStore = machine->storeUri.params.find("remote-store");
-        if (remoteStore != machine->storeUri.params.end()) {
-            command.push_back("--store");
-            command.push_back(shellEscape(remoteStore->second));
-        }
-    }
-
-    auto ret = master.startCommand(std::move(command), {
-        "-a", "-oBatchMode=yes", "-oConnectTimeout=60", "-oTCPKeepAlive=yes"
-    });
-
-    // XXX: determine the actual max value we can use from /proc.
-
-    // FIXME: Should this be upstreamed into `startCommand` in Nix?
-
-    int pipesize = 1024 * 1024;
-
-    fcntl(ret->in.get(), F_SETPIPE_SZ, &pipesize);
-    fcntl(ret->out.get(), F_SETPIPE_SZ, &pipesize);
-
-    return ret;
-}
-
-
-static void copyClosureTo(
-    ::Machine::Connection & conn,
-    Store & destStore,
-    const StorePathSet & paths,
-    SubstituteFlag useSubstitutes = NoSubstitute)
-{
-    StorePathSet closure;
-    destStore.computeFSClosure(paths, closure);
-
-    /* Send the "query valid paths" command with the "lock" option
-       enabled. This prevents a race where the remote host
-       garbage-collect paths that are already there. Optionally, ask
-       the remote host to substitute missing paths. */
-    // FIXME: substitute output pollutes our build log
-    /* Get back the set of paths that are already valid on the remote
-       host. */
-    auto present = conn.queryValidPaths(
-        destStore, true, closure, useSubstitutes);
-
-    if (present.size() == closure.size()) return;
-
-    auto sorted = destStore.topoSortPaths(closure);
-
-    StorePathSet missing;
-    for (auto i = sorted.rbegin(); i != sorted.rend(); ++i)
-        if (!present.count(*i)) missing.insert(*i);
-
-    printMsg(lvlDebug, "sending %d missing paths", missing.size());
-
-    std::unique_lock<std::timed_mutex> sendLock(conn.machine->state->sendLock,
-        std::chrono::seconds(600));
-
-    conn.to << ServeProto::Command::ImportPaths;
-    destStore.exportPaths(missing, conn.to);
-    conn.to.flush();
-
-    if (readInt(conn.from) != 1)
-        throw Error("remote machine failed to import closure");
-}
-
-
-// FIXME: use Store::topoSortPaths().
-static StorePaths reverseTopoSortPaths(const std::map<StorePath, UnkeyedValidPathInfo> & paths)
-{
-    StorePaths sorted;
-    StorePathSet visited;
-
-    std::function<void(const StorePath & path)> dfsVisit;
-
-    dfsVisit = [&](const StorePath & path) {
-        if (!visited.insert(path).second) return;
-
-        auto info = paths.find(path);
-        auto references = info == paths.end() ? StorePathSet() : info->second.references;
-
-        for (auto & i : references)
-            /* Don't traverse into paths that don't exist.  That can
-               happen due to substitutes for non-existent paths. */
-            if (i != path && paths.count(i))
-                dfsVisit(i);
-
-        sorted.push_back(path);
-    };
-
-    for (auto & i : paths)
-        dfsVisit(i.first);
-
-    return sorted;
-}
-
 static std::pair<Path, AutoCloseFD> openLogFile(const std::string & logDir, const StorePath & drvPath)
 {
     std::string base(drvPath.to_string());
@@ -203,13 +98,13 @@ static BasicDerivation sendInputs(
         auto now1 = std::chrono::steady_clock::now();
 
         /* Copy the input closure. */
-        if (conn.machine->isLocalhost()) {
-            StorePathSet closure;
-            destStore.computeFSClosure(basicDrv.inputSrcs, closure);
-            copyPaths(destStore, localStore, closure, NoRepair, NoCheckSigs, NoSubstitute);
-        } else {
-            copyClosureTo(conn, destStore, basicDrv.inputSrcs, Substitute);
-        }
+        copyClosure(
+            destStore,
+            conn.machine->isLocalhost() ? localStore : *conn.store,
+            basicDrv.inputSrcs,
+            NoRepair,
+            NoCheckSigs,
+            Substitute);
 
         auto now2 = std::chrono::steady_clock::now();
 
@@ -224,11 +119,10 @@ static BuildResult performBuild(
     Store & localStore,
     StorePath drvPath,
     const BasicDerivation & drv,
-    const ServeProto::BuildOptions & options,
     counter & nrStepsBuilding
 )
 {
-    conn.putBuildDerivationRequest(localStore, drvPath, drv, options);
+    auto kont = conn.store->buildDerivationAsync(drvPath, drv, bmNormal);
 
     BuildResult result;
 
@@ -237,7 +131,10 @@ static BuildResult performBuild(
     startTime = time(0);
     {
         MaintainCount<counter> mc(nrStepsBuilding);
-        result = ServeProto::Serialise<BuildResult>::read(localStore, conn);
+        result = kont();
+        // Without proper call-once functions, we need to manually
+        // delete after calling.
+        kont = {};
     }
     stopTime = time(0);
 
@@ -253,7 +150,7 @@ static BuildResult performBuild(
 
     // If the protocol was too old to give us `builtOutputs`, initialize
     // it manually by introspecting the derivation.
-    if (GET_PROTOCOL_MINOR(conn.remoteVersion) < 6)
+    if (GET_PROTOCOL_MINOR(conn.store->getProtocol()) < 6)
     {
         // If the remote is too old to handle CA derivations, we can’t get this
         // far anyways
@@ -278,55 +175,6 @@ static BuildResult performBuild(
     return result;
 }
 
-static void copyPathFromRemote(
-    ::Machine::Connection & conn,
-    NarMemberDatas & narMembers,
-    Store & localStore,
-    Store & destStore,
-    const ValidPathInfo & info
-)
-{
-      /* Receive the NAR from the remote and add it to the
-          destination store. Meanwhile, extract all the info from the
-          NAR that getBuildOutput() needs. */
-      auto source2 = sinkToSource([&](Sink & sink)
-      {
-          /* Note: we should only send the command to dump the store
-              path to the remote if the NAR is actually going to get read
-              by the destination store, which won't happen if this path
-              is already valid on the destination store. Since this
-              lambda function only gets executed if someone tries to read
-              from source2, we will send the command from here rather
-              than outside the lambda. */
-          conn.to << ServeProto::Command::DumpStorePath << localStore.printStorePath(info.path);
-          conn.to.flush();
-
-          TeeSource tee(conn.from, sink);
-          extractNarData(tee, localStore.printStorePath(info.path), narMembers);
-      });
-
-      destStore.addToStore(info, *source2, NoRepair, NoCheckSigs);
-}
-
-static void copyPathsFromRemote(
-    ::Machine::Connection & conn,
-    NarMemberDatas & narMembers,
-    Store & localStore,
-    Store & destStore,
-    const std::map<StorePath, UnkeyedValidPathInfo> & infos
-)
-{
-      auto pathsSorted = reverseTopoSortPaths(infos);
-
-      for (auto & path : pathsSorted) {
-          auto & info = infos.find(path)->second;
-          copyPathFromRemote(
-              conn, narMembers, localStore, destStore,
-              ValidPathInfo { path, info });
-      }
-
-}
-
 }
 
 /* using namespace nix::build_remote; */
@@ -389,7 +237,6 @@ void RemoteResult::updateWithBuildResult(const nix::BuildResult & buildResult)
 
 void State::buildRemote(ref<Store> destStore,
     ::Machine::ptr machine, Step::ptr step,
-    const ServeProto::BuildOptions & buildOptions,
     RemoteResult & result, std::shared_ptr<ActiveStep> activeStep,
     std::function<void(StepState)> updateStep,
     NarMemberDatas & narMembers)
@@ -404,35 +251,43 @@ void State::buildRemote(ref<Store> destStore,
 
         updateStep(ssConnecting);
 
-        auto storeRef = machine->completeStoreReference();
-
-        auto * pSpecified = std::get_if<StoreReference::Specified>(&storeRef.variant);
-        if (!pSpecified || pSpecified->scheme != "ssh") {
-            throw Error("Currently, only (legacy-)ssh stores are supported!");
-        }
-
-        LegacySSHStoreConfig storeConfig {
-            pSpecified->scheme,
-            pSpecified->authority,
-            storeRef.params
-        };
-
-        auto master = storeConfig.createSSHMaster(
-            false, // no SSH master yet
-            logFD.get());
-
         // FIXME: rewrite to use Store.
-        auto child = build_remote::openConnection(machine, master);
+        ::Machine::Connection conn {
+            .machine = machine,
+            .store = [&]{
+                auto * pSpecified = std::get_if<StoreReference::Specified>(&machine->storeUri.variant);
+                if (!pSpecified || pSpecified->scheme != "ssh-ng") {
+                    throw Error("Currently, only ssh-ng:// stores are supported!");
+                }
+
+                auto remoteStore = machine->openStore().dynamic_pointer_cast<RemoteStore>();
+                auto remoteStoreConfig = std::dynamic_pointer_cast<SSHStoreConfig>(remoteStore);
+                assert(remoteStore);
+
+                if (machine->isLocalhost()) {
+                    auto rp_new = remoteStoreConfig->remoteProgram.get();
+                    rp_new.push_back("--builders");
+                    rp_new.push_back("");
+                    const_cast<nix::Setting<Strings> &>(remoteStoreConfig->remoteProgram).assign(rp_new);
+                }
+                remoteStoreConfig->extraSshArgs = {
+                    "-a", "-oBatchMode=yes", "-oConnectTimeout=60", "-oTCPKeepAlive=yes"
+                };
+
+                // TODO logging
+                //const_cast<nix::Setting<int> &>(remoteStore->logFD).assign(logFD.get());
+
+                return nix::ref{remoteStore};
+            }(),
+        };
 
         {
             auto activeStepState(activeStep->state_.lock());
             if (activeStepState->cancelled) throw Error("step cancelled");
-            activeStepState->pid = child->sshPid;
         }
 
         Finally clearPid([&]() {
             auto activeStepState(activeStep->state_.lock());
-            activeStepState->pid = -1;
 
             /* FIXME: there is a slight race here with step
                cancellation in State::processQueueChange(), which
@@ -442,35 +297,13 @@ void State::buildRemote(ref<Store> destStore,
                process. Meh. */
         });
 
-        ::Machine::Connection conn {
-            {
-                .to = child->in.get(),
-                .from = child->out.get(),
-                /* Handshake. */
-                .remoteVersion = 0xdadbeef, // FIXME avoid dummy initialize
-            },
-            /*.machine =*/ machine,
-        };
-
         Finally updateStats([&]() {
-            bytesReceived += conn.from.read;
-            bytesSent += conn.to.written;
+            // TODO
+            //auto stats = conn.store->getConnectionStats();
+            //bytesReceived += stats.bytesReceived;
+            //bytesSent += stats.bytesSent;
         });
 
-        constexpr ServeProto::Version our_version = 0x206;
-
-        try {
-            conn.remoteVersion = decltype(conn)::handshake(
-                conn.to,
-                conn.from,
-                our_version,
-                machine->storeUri.render());
-        } catch (EndOfFile & e) {
-            child->sshPid.wait();
-            std::string s = chomp(readFile(result.logFile));
-            throw Error("cannot connect to ‘%1%’: %2%", machine->storeUri.render(), s);
-        }
-
         {
             auto info(machine->state->connectInfo.lock());
             info->consecutiveFailures = 0;
@@ -508,7 +341,6 @@ void State::buildRemote(ref<Store> destStore,
             *localStore,
             step->drvPath,
             resolvedDrv,
-            buildOptions,
             nrStepsBuilding
         );
 
@@ -539,21 +371,12 @@ void State::buildRemote(ref<Store> destStore,
 
             auto now1 = std::chrono::steady_clock::now();
 
-            auto infos = conn.queryPathInfos(*localStore, outputs);
-
-            size_t totalNarSize = 0;
-            for (auto & [_, info] : infos) totalNarSize += info.narSize;
-
-            if (totalNarSize > maxOutputSize) {
-                result.stepStatus = bsNarSizeLimitExceeded;
-                return;
-            }
-
             /* Copy each path. */
-            printMsg(lvlDebug, "copying outputs of ‘%s’ from ‘%s’ (%d bytes)",
-                localStore->printStorePath(step->drvPath), machine->storeUri.render(), totalNarSize);
+            printMsg(lvlDebug, "copying outputs of ‘%s’ from ‘%s’",
+                localStore->printStorePath(step->drvPath), machine->storeUri.render());
+
+            copyClosure(*conn.store, *destStore, outputs);
 
-            build_remote::copyPathsFromRemote(conn, narMembers, *localStore, *destStore, infos);
             auto now2 = std::chrono::steady_clock::now();
 
             result.overhead += std::chrono::duration_cast<std::chrono::milliseconds>(now2 - now1).count();
@@ -574,9 +397,11 @@ void State::buildRemote(ref<Store> destStore,
             }
         }
 
-        /* Shut down the connection. */
-        child->in = -1;
-        child->sshPid.wait();
+        /* Shut down the connection done by RAII.
+
+           Only difference is kill() instead of wait() (i.e. send signal
+           then wait())
+         */
 
     } catch (Error & e) {
         /* Disable this machine until a certain period of time has

src/hydra-queue-runner/builder.cc

@@ -98,13 +98,6 @@ State::StepResult State::doBuildStep(nix::ref<Store> destStore,
        it). */
     BuildID buildId;
     std::optional<StorePath> buildDrvPath;
-    // Other fields set below
-    nix::ServeProto::BuildOptions buildOptions {
-        .maxLogSize = maxLogSize,
-        .nrRepeats = step->isDeterministic ? 1u : 0u,
-        .enforceDeterminism = step->isDeterministic,
-        .keepFailed = false,
-    };
 
     auto conn(dbPool.get());
 
@@ -139,18 +132,19 @@ State::StepResult State::doBuildStep(nix::ref<Store> destStore,
             {
                 auto i = jobsetRepeats.find(std::make_pair(build2->projectName, build2->jobsetName));
                 if (i != jobsetRepeats.end())
-                    buildOptions.nrRepeats = std::max(buildOptions.nrRepeats, i->second);
+                    warn("jobset repeats is deprecated; nix stopped supporting this correctly a long time ago.");
             }
         }
         if (!build) build = *dependents.begin();
 
         buildId = build->id;
         buildDrvPath = build->drvPath;
-        buildOptions.maxSilentTime = build->maxSilentTime;
-        buildOptions.buildTimeout = build->buildTimeout;
+        settings.maxLogSize = maxLogSize;
+        settings.maxSilentTime = build->maxSilentTime;
+        settings.buildTimeout = build->buildTimeout;
 
         printInfo("performing step ‘%s’ %d times on ‘%s’ (needed by build %d and %d others)",
-            localStore->printStorePath(step->drvPath), buildOptions.nrRepeats + 1, machine->storeUri.render(), buildId, (dependents.size() - 1));
+            localStore->printStorePath(step->drvPath), 1, machine->storeUri.render(), buildId, (dependents.size() - 1));
     }
 
     if (!buildOneDone)
@@ -211,7 +205,7 @@ State::StepResult State::doBuildStep(nix::ref<Store> destStore,
 
         try {
             /* FIXME: referring builds may have conflicting timeouts. */
-            buildRemote(destStore, machine, step, buildOptions, result, activeStep, updateStep, narMembers);
+            buildRemote(destStore, machine, step, result, activeStep, updateStep, narMembers);
         } catch (Error & e) {
             if (activeStep->state_.lock()->cancelled) {
                 printInfo("marking step %d of build %d as cancelled", stepNr, buildId);

src/hydra-queue-runner/hydra-queue-runner.cc

@@ -182,7 +182,7 @@ void State::monitorMachinesFile()
         getEnv("NIX_REMOTE_SYSTEMS").value_or(pathExists(defaultMachinesFile) ? defaultMachinesFile : ""), ":");
 
     if (machinesFiles.empty()) {
-        parseMachines("localhost " +
+        parseMachines("ssh-ng://localhost " +
             (settings.thisSystem == "x86_64-linux" ? "x86_64-linux,i686-linux" : settings.thisSystem.get())
             + " - " + std::to_string(settings.maxBuildJobs) + " 1 "
             + concatStringsSep(",", StoreConfig::getDefaultSystemFeatures()));

src/hydra-queue-runner/state.hh

@@ -20,9 +20,7 @@
 #include "store-api.hh"
 #include "sync.hh"
 #include "nar-extractor.hh"
-#include "serve-protocol.hh"
-#include "serve-protocol-impl.hh"
-#include "serve-protocol-connection.hh"
+#include "ssh-store.hh"
 #include "machines.hh"
 
 
@@ -292,14 +290,16 @@ struct Machine : nix::Machine
     bool isLocalhost() const;
 
     // A connection to a machine
-    struct Connection : nix::ServeProto::BasicClientConnection {
+    struct Connection {
         // Backpointer to the machine
         ptr machine;
+        // Opened store
+        nix::ref<nix::RemoteStore> store;
     };
 };
 
 
-class HydraConfig;
+struct HydraConfig;
 
 
 class State
@@ -542,7 +542,6 @@ private:
 
     void buildRemote(nix::ref<nix::Store> destStore,
         Machine::ptr machine, Step::ptr step,
-        const nix::ServeProto::BuildOptions & buildOptions,
         RemoteResult & result, std::shared_ptr<ActiveStep> activeStep,
         std::function<void(StepState)> updateStep,
         NarMemberDatas & narMembers);

src/lib/Hydra/View/TT.pm

@@ -6,7 +6,6 @@ use base 'Catalyst::View::TT';
 use Template::Plugin::HTML;
 use Hydra::Helper::Nix;
 use Time::Seconds;
-use Digest::SHA qw(sha1_hex);
 
 __PACKAGE__->config(
     TEMPLATE_EXTENSION => '.tt',
@@ -26,14 +25,8 @@ __PACKAGE__->config(
     makeNameTextForJobset
     relativeDuration
     stripSSHUser
-    metricDivId
     /]);
 
-sub metricDivId {
-    my ($self, $c, $text) = @_;
-    return "metric-" . sha1_hex($text);
-}
-
 sub buildLogExists {
     my ($self, $c, $build) = @_;
     return 1 if defined $c->config->{log_prefix};

src/root/job-metrics-tab.tt

@@ -18,7 +18,8 @@
 
     <h3>Metric: <a [% HTML.attributes(href => c.uri_for('/job' project.name jobset.name job 'metric' metric.name)) %]><tt>[%HTML.escape(metric.name)%]</tt></a></h3>
 
-    [% id = metricDivId(metric.name);
+    [% id = "metric-" _ metric.name;
+       id = id.replace('\.', '_');
        INCLUDE createChart dataUrl=c.uri_for('/job' project.name jobset.name job 'metric' metric.name); %]
 
   [% END %]

src/script/hydra-eval-jobset

@@ -773,9 +773,6 @@ sub checkJobsetWrapped {
     my $jobsetChanged = 0;
     my %buildMap;
 
-    my @jobs;
-    push @jobs, $_ while defined($_ = $jobsIter->());
-
     $db->txn_do(sub {
         my $prevEval = getPrevJobsetEval($db, $jobset, 1);
 
@@ -799,7 +796,7 @@ sub checkJobsetWrapped {
 
         my @jobsWithConstituents;
 
-        foreach my $job (@jobs) {
+        while (defined(my $job = $jobsIter->())) {
             if ($jobsetsJobset) {
                 die "The .jobsets jobset must only have a single job named 'jobsets'"
                     unless $job->{attr} eq "jobsets";

t/evaluator/evaluate-constituents-broken.t

@@ -6,55 +6,27 @@ use Hydra::Helper::Exec;
 
 my $ctx = test_context();
 
-subtest "broken constituents expression" => sub {
-    my $jobsetCtx = $ctx->makeJobset(
-        expression => 'constituents-broken.nix',
-    );
-    my $jobset = $jobsetCtx->{"jobset"};
+my $jobsetCtx = $ctx->makeJobset(
+    expression => 'constituents-broken.nix',
+);
+my $jobset = $jobsetCtx->{"jobset"};
 
-    my ($res, $stdout, $stderr) = captureStdoutStderr(60,
-        ("hydra-eval-jobset", $jobsetCtx->{"project"}->name, $jobset->name)
-    );
-    isnt($res, 0, "hydra-eval-jobset exits non-zero");
-    ok(utf8::decode($stderr), "Stderr output is UTF8-clean");
-    like(
-        $stderr,
-        qr/aggregate job 'mixed_aggregate' references non-existent job 'constituentA'/,
-        "The stderr record includes a relevant error message"
-    );
+my ($res, $stdout, $stderr) = captureStdoutStderr(60,
+    ("hydra-eval-jobset", $jobsetCtx->{"project"}->name, $jobset->name)
+);
+isnt($res, 0, "hydra-eval-jobset exits non-zero");
+ok(utf8::decode($stderr), "Stderr output is UTF8-clean");
+like(
+    $stderr,
+    qr/aggregate job ‘mixed_aggregate’ failed with the error: "constituentA": does not exist/,
+    "The stderr record includes a relevant error message"
+);
 
-    $jobset->discard_changes({ '+columns' => {'errormsg' => 'errormsg'} });  # refresh from DB
-    like(
-        $jobset->errormsg,
-        qr/aggregate job ‘mixed_aggregate’ failed with the error: constituentA: does not exist/,
-        "The jobset records a relevant error message"
-    );
-};
-
-subtest "no matches" => sub {
-    my $jobsetCtx = $ctx->makeJobset(
-        expression => 'constituents-no-matches.nix',
-    );
-    my $jobset = $jobsetCtx->{"jobset"};
-
-    my ($res, $stdout, $stderr) = captureStdoutStderr(60,
-        ("hydra-eval-jobset", $jobsetCtx->{"project"}->name, $jobset->name)
-    );
-    isnt($res, 0, "hydra-eval-jobset exits non-zero");
-    ok(utf8::decode($stderr), "Stderr output is UTF8-clean");
-    like(
-        $stderr,
-        qr/aggregate job 'non_match_aggregate' references constituent glob pattern 'tests\.\*' with no matches/,
-        "The stderr record includes a relevant error message"
-    );
-
-    $jobset->discard_changes({ '+columns' => {'errormsg' => 'errormsg'} });  # refresh from DB
-    like(
-        $jobset->errormsg,
-        qr/aggregate job ‘non_match_aggregate’ failed with the error: tests\.\*: constituent glob pattern had no matches/,
-        qr/in job ‘non_match_aggregate’:\ntests\.\*: constituent glob pattern had no matches/,
-        "The jobset records a relevant error message"
-    );
-};
+$jobset->discard_changes({ '+columns' => {'errormsg' => 'errormsg'} });  # refresh from DB
+like(
+    $jobset->errormsg,
+    qr/aggregate job ‘mixed_aggregate’ failed with the error: "constituentA": does not exist/,
+    "The jobset records a relevant error message"
+);
 
 done_testing;

t/evaluator/evaluate-constituents-globbing.t

@@ -1,138 +0,0 @@
-use strict;
-use warnings;
-use Setup;
-use Test2::V0;
-use Hydra::Helper::Exec;
-use Data::Dumper;
-
-my $ctx = test_context();
-
-subtest "general glob testing" => sub {
-    my $jobsetCtx = $ctx->makeJobset(
-        expression => 'constituents-glob.nix',
-    );
-    my $jobset = $jobsetCtx->{"jobset"};
-
-    my ($res, $stdout, $stderr) = captureStdoutStderr(60,
-        ("hydra-eval-jobset", $jobsetCtx->{"project"}->name, $jobset->name)
-    );
-    is($res, 0, "hydra-eval-jobset exits zero");
-
-    my $builds = {};
-    for my $build ($jobset->builds) {
-        $builds->{$build->job} = $build;
-    }
-
-    subtest "basic globbing works" => sub {
-        ok(defined $builds->{"ok_aggregate"}, "'ok_aggregate' is part of the jobset evaluation");
-        my @constituents = $builds->{"ok_aggregate"}->constituents->all;
-        is(2, scalar @constituents, "'ok_aggregate' has two constituents");
-
-        my @sortedConstituentNames = sort (map { $_->nixname } @constituents);
-
-        is($sortedConstituentNames[0], "empty-dir-A", "first constituent of 'ok_aggregate' is 'empty-dir-A'");
-        is($sortedConstituentNames[1], "empty-dir-B", "second constituent of 'ok_aggregate' is 'empty-dir-B'");
-    };
-
-    subtest "transitivity is OK" => sub {
-        ok(defined $builds->{"indirect_aggregate"}, "'indirect_aggregate' is part of the jobset evaluation");
-        my @constituents = $builds->{"indirect_aggregate"}->constituents->all;
-        is(1, scalar @constituents, "'indirect_aggregate' has one constituent");
-        is($constituents[0]->nixname, "direct_aggregate", "'indirect_aggregate' has 'direct_aggregate' as single constituent");
-    };
-};
-
-subtest "* selects all except current aggregate" => sub {
-    my $jobsetCtx = $ctx->makeJobset(
-        expression => 'constituents-glob-all.nix',
-    );
-    my $jobset = $jobsetCtx->{"jobset"};
-
-    my ($res, $stdout, $stderr) = captureStdoutStderr(60,
-        ("hydra-eval-jobset", $jobsetCtx->{"project"}->name, $jobset->name)
-    );
-
-    subtest "no eval errors" => sub {
-        ok(utf8::decode($stderr), "Stderr output is UTF8-clean");
-        ok(
-            $stderr !~ "aggregate job ‘ok_aggregate’ has a constituent .* that doesn't correspond to a Hydra build",
-            "Catchall wildcard must not select itself as constituent"
-        );
-
-        $jobset->discard_changes;  # refresh from DB
-        is(
-            $jobset->errormsg,
-            "",
-            "eval-errors non-empty"
-        );
-    };
-
-    my $builds = {};
-    for my $build ($jobset->builds) {
-        $builds->{$build->job} = $build;
-    }
-
-    subtest "two constituents" => sub {
-        ok(defined $builds->{"ok_aggregate"}, "'ok_aggregate' is part of the jobset evaluation");
-        my @constituents = $builds->{"ok_aggregate"}->constituents->all;
-        is(2, scalar @constituents, "'ok_aggregate' has two constituents");
-
-        my @sortedConstituentNames = sort (map { $_->nixname } @constituents);
-
-        is($sortedConstituentNames[0], "empty-dir-A", "first constituent of 'ok_aggregate' is 'empty-dir-A'");
-        is($sortedConstituentNames[1], "empty-dir-B", "second constituent of 'ok_aggregate' is 'empty-dir-B'");
-    };
-};
-
-subtest "trivial cycle check" => sub {
-    my $jobsetCtx = $ctx->makeJobset(
-        expression => 'constituents-cycle.nix',
-    );
-    my $jobset = $jobsetCtx->{"jobset"};
-
-    my ($res, $stdout, $stderr) = captureStdoutStderr(60,
-        ("hydra-eval-jobset", $jobsetCtx->{"project"}->name, $jobset->name)
-    );
-
-    ok(
-        $stderr =~ "Found dependency cycle between jobs 'indirect_aggregate' and 'ok_aggregate'",
-        "Dependency cycle error is on stderr"
-    );
-
-    ok(utf8::decode($stderr), "Stderr output is UTF8-clean");
-
-    $jobset->discard_changes;  # refresh from DB
-    like(
-        $jobset->errormsg,
-        qr/Dependency cycle: indirect_aggregate <-> ok_aggregate/,
-        "eval-errors non-empty"
-    );
-
-    is(0, $jobset->builds->count, "No builds should be scheduled");
-};
-
-subtest "cycle check with globbing" => sub {
-    my $jobsetCtx = $ctx->makeJobset(
-        expression => 'constituents-cycle-glob.nix',
-    );
-    my $jobset = $jobsetCtx->{"jobset"};
-
-    my ($res, $stdout, $stderr) = captureStdoutStderr(60,
-        ("hydra-eval-jobset", $jobsetCtx->{"project"}->name, $jobset->name)
-    );
-
-    ok(utf8::decode($stderr), "Stderr output is UTF8-clean");
-
-    $jobset->discard_changes;  # refresh from DB
-    like(
-        $jobset->errormsg,
-        qr/aggregate job ‘indirect_aggregate’ failed with the error: Dependency cycle: indirect_aggregate <-> packages.constituentA/,
-        "packages.constituentA error missing"
-    );
-
-    # on this branch of Hydra, hydra-eval-jobset fails hard if an aggregate
-    # job is broken.
-    is(0, $jobset->builds->count, "Zero jobs are scheduled");
-};
-
-done_testing;

t/jobs/config.nix

@@ -1,14 +0,0 @@
-rec {
-  path = "/nix/store/l9mg93sgx50y88p5rr6x1vib6j1rjsds-coreutils-9.1/bin";
-
-  mkDerivation = args:
-    derivation ({
-      system = builtins.currentSystem;
-      PATH = path;
-    } // args);
-  mkContentAddressedDerivation = args: mkDerivation ({
-    __contentAddressed = true;
-    outputHashMode = "recursive";
-    outputHashAlgo = "sha256";
-  } // args);
-}

t/jobs/constituents-cycle-glob.nix

@@ -1,34 +0,0 @@
-with import ./config.nix;
-{
-  packages.constituentA = mkDerivation {
-    name = "empty-dir-A";
-    builder = ./empty-dir-builder.sh;
-    _hydraAggregate = true;
-    _hydraGlobConstituents = true;
-    constituents = [ "*_aggregate" ];
-  };
-
-  packages.constituentB = mkDerivation {
-    name = "empty-dir-B";
-    builder = ./empty-dir-builder.sh;
-  };
-
-  ok_aggregate = mkDerivation {
-    name = "direct_aggregate";
-    _hydraAggregate = true;
-    _hydraGlobConstituents = true;
-    constituents = [
-      "packages.*"
-    ];
-    builder = ./empty-dir-builder.sh;
-  };
-
-  indirect_aggregate = mkDerivation {
-    name = "indirect_aggregate";
-    _hydraAggregate = true;
-    constituents = [
-      "ok_aggregate"
-    ];
-    builder = ./empty-dir-builder.sh;
-  };
-}

t/jobs/constituents-cycle.nix

@@ -1,21 +0,0 @@
-with import ./config.nix;
-{
-  ok_aggregate = mkDerivation {
-    name = "direct_aggregate";
-    _hydraAggregate = true;
-    _hydraGlobConstituents = true;
-    constituents = [
-      "indirect_aggregate"
-    ];
-    builder = ./empty-dir-builder.sh;
-  };
-
-  indirect_aggregate = mkDerivation {
-    name = "indirect_aggregate";
-    _hydraAggregate = true;
-    constituents = [
-      "ok_aggregate"
-    ];
-    builder = ./empty-dir-builder.sh;
-  };
-}

t/jobs/constituents-glob-all.nix

@@ -1,22 +0,0 @@
-with import ./config.nix;
-{
-  packages.constituentA = mkDerivation {
-    name = "empty-dir-A";
-    builder = ./empty-dir-builder.sh;
-  };
-
-  packages.constituentB = mkDerivation {
-    name = "empty-dir-B";
-    builder = ./empty-dir-builder.sh;
-  };
-
-  ok_aggregate = mkDerivation {
-    name = "direct_aggregate";
-    _hydraAggregate = true;
-    _hydraGlobConstituents = true;
-    constituents = [
-      "*"
-    ];
-    builder = ./empty-dir-builder.sh;
-  };
-}

t/jobs/constituents-glob.nix

@@ -1,31 +0,0 @@
-with import ./config.nix;
-{
-  packages.constituentA = mkDerivation {
-    name = "empty-dir-A";
-    builder = ./empty-dir-builder.sh;
-  };
-
-  packages.constituentB = mkDerivation {
-    name = "empty-dir-B";
-    builder = ./empty-dir-builder.sh;
-  };
-
-  ok_aggregate = mkDerivation {
-    name = "direct_aggregate";
-    _hydraAggregate = true;
-    _hydraGlobConstituents = true;
-    constituents = [
-      "packages.*"
-    ];
-    builder = ./empty-dir-builder.sh;
-  };
-
-  indirect_aggregate = mkDerivation {
-    name = "indirect_aggregate";
-    _hydraAggregate = true;
-    constituents = [
-      "ok_aggregate"
-    ];
-    builder = ./empty-dir-builder.sh;
-  };
-}

t/jobs/constituents-no-matches.nix

@@ -1,20 +0,0 @@
-with import ./config.nix;
-{
-  non_match_aggregate = mkDerivation {
-    name = "mixed_aggregate";
-    _hydraAggregate = true;
-    _hydraGlobConstituents = true;
-    constituents = [
-      "tests.*"
-    ];
-    builder = ./empty-dir-builder.sh;
-  };
-
-  # Without a second job no jobset is attempted to be created
-  # (the only job would be broken)
-  # and thus the constituent validation is never reached.
-  dummy = mkDerivation {
-    name = "dummy";
-    builder = ./empty-dir-builder.sh;
-  };
-}

t/jobs/declarative/project.json

@@ -1,24 +0,0 @@
-{
-    "enabled": 1,
-    "hidden": false,
-    "description": "declarative-jobset-example",
-    "nixexprinput": "src",
-    "nixexprpath": "declarative/generator.nix",
-    "checkinterval": 300,
-    "schedulingshares": 100,
-    "enableemail": false,
-    "emailoverride": "",
-    "keepnr": 3,
-    "inputs": {
-        "src": {
-            "type": "path",
-            "value": "/home/ma27/Projects/hydra-cppnix/t/jobs",
-            "emailresponsible": false
-        },
-        "jobspath": {
-            "type": "string",
-            "value": "/home/ma27/Projects/hydra-cppnix/t/jobs",
-            "emailresponsible": false
-        }
-    }
-}

t/queue-runner/constituents.t

@@ -22,11 +22,11 @@ is(nrQueuedBuildsForJobset($jobset), 0, "Evaluating jobs/broken-constituent.nix
 
 like(
     $jobset->errormsg,
-    qr/^does-not-exist: does not exist$/m,
+    qr/^"does-not-exist": does not exist$/m,
     "Evaluating jobs/broken-constituent.nix should log an error for does-not-exist");
 like(
     $jobset->errormsg,
-    qr/^does-not-evaluate: error: assertion 'false' failed/m,
+    qr/^"does-not-evaluate": "error: assertion 'false' failed/m,
     "Evaluating jobs/broken-constituent.nix should log an error for does-not-evaluate");
 
 done_testing;