ahuston-0/hydra
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge pull request #1324 from obsidiansystems/serve-proto-build-options-serializer

Browse Source 
Use `ServeProto::Serialise<ServeProto::BuildOptions>`
This commit is contained in:
John Ericson 2023-12-11 10:45:33 -05:00 committed by GitHub
commit f3a760ad9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/hydra-queue-runner/build-remote.cc
View File

@ -203,7 +203,9 @@ static std::pair<Path, AutoCloseFD> openLogFile(const std::string & logDir, cons
*/ */
static void handshake(Machine::Connection & conn, unsigned int repeats) static void handshake(Machine::Connection & conn, unsigned int repeats)
{ {
conn.to << SERVE_MAGIC_1 << 0x206; constexpr ServeProto::Version our_version = 0x206;
conn.to << SERVE_MAGIC_1 << our_version;
conn.to.flush(); conn.to.flush();
unsigned int magic = readInt(conn.from); unsigned int magic = readInt(conn.from);
@ -215,6 +217,9 @@ static void handshake(Machine::Connection & conn, unsigned int repeats)
throw Error("unsupported ‘nix-store --serve’ protocol version on ‘%1%’", conn.machine->sshName); throw Error("unsupported ‘nix-store --serve’ protocol version on ‘%1%’", conn.machine->sshName);
if (GET_PROTOCOL_MINOR(conn.remoteVersion) < 3 && repeats > 0) if (GET_PROTOCOL_MINOR(conn.remoteVersion) < 3 && repeats > 0)
throw Error("machine ‘%1%’ does not support repeating a build; please upgrade it to Nix 1.12", conn.machine->sshName); throw Error("machine ‘%1%’ does not support repeating a build; please upgrade it to Nix 1.12", conn.machine->sshName);
// Do not attempt to speak a newer version of the protocol
conn.remoteVersion = std::min(conn.remoteVersion, our_version);
} }
static BasicDerivation sendInputs( static BasicDerivation sendInputs(
@ -288,14 +293,7 @@ static BuildResult performBuild(
{ {
conn.to << ServeProto::Command::BuildDerivation << localStore.printStorePath(drvPath); conn.to << ServeProto::Command::BuildDerivation << localStore.printStorePath(drvPath);
writeDerivation(conn.to, localStore, drv); writeDerivation(conn.to, localStore, drv);
conn.to << options.maxSilentTime << options.buildTimeout; ServeProto::write(localStore, conn, options);
if (GET_PROTOCOL_MINOR(conn.remoteVersion) >= 2)
conn.to << options.maxLogSize;
if (GET_PROTOCOL_MINOR(conn.remoteVersion) >= 3) {
conn.to
<< options.nrRepeats
<< options.enforceDeterminism;
}
conn.to.flush(); conn.to.flush();
BuildResult result; BuildResult result;