forked from M-Labs/it-infra
Sebastien Bourdeauducq
805a3e33ad
This obsoletes the fixed-output derivation hack previously used on Hydra, and the associated retry patch.
85 lines
2.9 KiB
Diff
85 lines
2.9 KiB
Diff
diff --git a/src/libstore/build.cc b/src/libstore/build.cc
|
|
index 53a0958a..16a98aec 100644
|
|
--- a/src/libstore/build.cc
|
|
+++ b/src/libstore/build.cc
|
|
@@ -809,9 +809,16 @@ private:
|
|
/* Whether this is a fixed-output derivation. */
|
|
bool fixedOutput;
|
|
|
|
+ bool networked;
|
|
+
|
|
/* Whether to run the build in a private network namespace. */
|
|
bool privateNetwork = false;
|
|
|
|
+ bool allowNetwork()
|
|
+ {
|
|
+ return fixedOutput || networked;
|
|
+ }
|
|
+
|
|
typedef void (DerivationGoal::*GoalState)();
|
|
GoalState state;
|
|
|
|
@@ -1179,6 +1186,8 @@ void DerivationGoal::haveDerivation()
|
|
{
|
|
trace("have derivation");
|
|
|
|
+ fixedOutput = drv->isFixedOutput();
|
|
+
|
|
retrySubstitution = false;
|
|
|
|
for (auto & i : drv->outputs)
|
|
@@ -1195,6 +1204,8 @@ void DerivationGoal::haveDerivation()
|
|
|
|
parsedDrv = std::make_unique<ParsedDerivation>(drvPath, *drv);
|
|
|
|
+ networked = parsedDrv->getBoolAttr("__networked");
|
|
+
|
|
/* We are first going to try to create the invalid output paths
|
|
through substitutes. If that doesn't work, we'll build
|
|
them. */
|
|
@@ -1987,7 +1998,7 @@ void DerivationGoal::startBuilder()
|
|
else if (settings.sandboxMode == smDisabled)
|
|
useChroot = false;
|
|
else if (settings.sandboxMode == smRelaxed)
|
|
- useChroot = !fixedOutput && !noChroot;
|
|
+ useChroot = !allowNetwork() && !noChroot;
|
|
}
|
|
|
|
if (worker.store.storeDir != worker.store.realStoreDir) {
|
|
@@ -2153,7 +2164,7 @@ void DerivationGoal::startBuilder()
|
|
"nogroup:x:65534:\n") % sandboxGid).str());
|
|
|
|
/* Create /etc/hosts with localhost entry. */
|
|
- if (!fixedOutput)
|
|
+ if (!allowNetwork())
|
|
writeFile(chrootRootDir + "/etc/hosts", "127.0.0.1 localhost\n::1 localhost\n");
|
|
|
|
/* Make the closure of the inputs available in the chroot,
|
|
@@ -2361,7 +2372,7 @@ void DerivationGoal::startBuilder()
|
|
us.
|
|
*/
|
|
|
|
- if (!fixedOutput)
|
|
+ if (!allowNetwork())
|
|
privateNetwork = true;
|
|
|
|
userNamespaceSync.create();
|
|
@@ -2573,7 +2584,7 @@ void DerivationGoal::initEnv()
|
|
to the builder is generally impure, but the output of
|
|
fixed-output derivations is by definition pure (since we
|
|
already know the cryptographic hash of the output). */
|
|
- if (fixedOutput) {
|
|
+ if (allowNetwork()) {
|
|
for (auto & i : parsedDrv->getStringsAttr("impureEnvVars").value_or(Strings()))
|
|
env[i] = getEnv(i).value_or("");
|
|
}
|
|
@@ -3184,7 +3195,7 @@ void DerivationGoal::runChild()
|
|
/* Fixed-output derivations typically need to access the
|
|
network, so give them access to /etc/resolv.conf and so
|
|
on. */
|
|
- if (fixedOutput) {
|
|
+ if (allowNetwork()) {
|
|
ss.push_back("/etc/resolv.conf");
|
|
|
|
// Only use nss functions to resolve hosts and
|