[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/07: daemon: Add 'buildMode' parameter to 'buildPaths' RPC.
From: |
Ludovic Courtès |
Subject: |
07/07: daemon: Add 'buildMode' parameter to 'buildPaths' RPC. |
Date: |
Wed, 02 Dec 2015 17:39:11 +0000 |
civodul pushed a commit to branch master
in repository guix.
commit 708d9070006fd46ffe4c2c3cf64154ea4430202a
Author: Ludovic Courtès <address@hidden>
Date: Wed Dec 2 18:43:51 2015 +0200
daemon: Add 'buildMode' parameter to 'buildPaths' RPC.
* nix/libstore/worker-protocol.hh (PROTOCOL_VERSION): Bump to 0x10f.
* nix/libstore/remote-store.cc (RemoteStore::buildPaths): Send the
BUILDMODE when the daemon supports it. Reject invalid values of
BUILDMODE for old daemons.
* nix/nix-daemon/nix-daemon.cc (performOp) <wopBuildPaths>: Read the
build mode when the client supports it.
---
nix/libstore/remote-store.cc | 11 +++++++++--
nix/libstore/worker-protocol.hh | 2 +-
nix/nix-daemon/nix-daemon.cc | 11 ++++++++++-
3 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/nix/libstore/remote-store.cc b/nix/libstore/remote-store.cc
index 0539bbe..324ef5e 100644
--- a/nix/libstore/remote-store.cc
+++ b/nix/libstore/remote-store.cc
@@ -462,11 +462,18 @@ Paths RemoteStore::importPaths(bool requireSignature,
Source & source)
void RemoteStore::buildPaths(const PathSet & drvPaths, BuildMode buildMode)
{
- if (buildMode != bmNormal) throw Error("repairing or checking is not
supported when building through the Nix daemon");
openConnection();
writeInt(wopBuildPaths, to);
- if (GET_PROTOCOL_MINOR(daemonVersion) >= 13)
+ if (GET_PROTOCOL_MINOR(daemonVersion) >= 13) {
writeStrings(drvPaths, to);
+ if (GET_PROTOCOL_MINOR(daemonVersion) >= 15) {
+ writeInt(buildMode, to);
+ }
+ /* Old daemons did not take a 'buildMode' parameter, so we need to
+ validate it here on the client side. */
+ else if (buildMode != bmNormal) throw Error("repairing or checking \
+is not supported when building through the Nix daemon");
+ }
else {
/* For backwards compatibility with old daemons, strip output
identifiers. */
diff --git a/nix/libstore/worker-protocol.hh b/nix/libstore/worker-protocol.hh
index d037d74..7b7be4a 100644
--- a/nix/libstore/worker-protocol.hh
+++ b/nix/libstore/worker-protocol.hh
@@ -6,7 +6,7 @@ namespace nix {
#define WORKER_MAGIC_1 0x6e697863
#define WORKER_MAGIC_2 0x6478696f
-#define PROTOCOL_VERSION 0x10e
+#define PROTOCOL_VERSION 0x10f
#define GET_PROTOCOL_MAJOR(x) ((x) & 0xff00)
#define GET_PROTOCOL_MINOR(x) ((x) & 0x00ff)
diff --git a/nix/nix-daemon/nix-daemon.cc b/nix/nix-daemon/nix-daemon.cc
index bd9eebe..c1e697b 100644
--- a/nix/nix-daemon/nix-daemon.cc
+++ b/nix/nix-daemon/nix-daemon.cc
@@ -451,8 +451,17 @@ static void performOp(bool trusted, unsigned int
clientVersion,
case wopBuildPaths: {
PathSet drvs = readStorePaths<PathSet>(from);
+ BuildMode mode = bmNormal;
+ if (GET_PROTOCOL_MINOR(clientVersion) >= 15) {
+ mode = (BuildMode)readInt(from);
+
+ /* Repairing is not atomic, so disallowed for "untrusted"
+ clients. */
+ if (mode == bmRepair && !trusted)
+ throw Error("repairing is not supported when building through
the Nix daemon");
+ }
startWork();
- store->buildPaths(drvs);
+ store->buildPaths(drvs, mode);
stopWork();
writeInt(1, to);
break;
- branch master updated (18b3151 -> 708d907), Ludovic Courtès, 2015/12/02
- 04/07: daemon: Support SHA-512 hashes., Ludovic Courtès, 2015/12/02
- 03/07: daemon: int2String -> std::to_string., Ludovic Courtès, 2015/12/02
- 07/07: daemon: Add 'buildMode' parameter to 'buildPaths' RPC.,
Ludovic Courtès <=
- 06/07: daemon: optimizePath: Detect some .links corruptions., Ludovic Courtès, 2015/12/02
- 05/07: daemon: Fix namespace issue., Ludovic Courtès, 2015/12/02
- 02/07: daemon: Filter build-chroot-dirs entries that conflict with derivation outputs., Ludovic Courtès, 2015/12/02
- 01/07: daemon: Prevent .chroot from being GC'ed when using LocalStore::buildDerivation(), Ludovic Courtès, 2015/12/02