mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Really fix the substitute mechanism, i.e., ensure the closure

Browse source 
invariant by registering references through the manifest.
* Added a test for nix-pull.
This commit is contained in:
Eelco Dolstra 2005-01-25 17:08:52 +00:00
parent c6290e42bc
commit 066da4ab85
16 changed files with 255 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/libstore/build.cc
View file

@ -472,9 +472,8 @@ void DerivationGoal::outputsSubstituted()
{
trace("all outputs substituted (maybe)");
if (nrFailed > 0 && !tryFallback) {
if (nrFailed > 0 && !tryFallback)
throw Error(format("some substitutes for the outputs of derivation `%1%' failed; try `--fallback'") % drvPath);
}
nrFailed = 0;
@ -1252,6 +1251,9 @@ private:
/* The current substitute. */
Substitute sub;
/* Outgoing references for this path. */
PathSet references;
/* Pipe for the substitute's standard output/error. */
Pipe logPipe;
@ -1272,6 +1274,7 @@ public:
/* The states. */
void init();
void referencesValid();
void tryNext();
void tryToRun();
void finished();
@ -1313,13 +1316,35 @@ void SubstitutionGoal::init()
return;
}
/* !!! build the outgoing references of this path first to
maintain the closure invariant! */
/* Otherwise, get the substitutes. */
/* Read the substitutes. */
subs = querySubstitutes(storePath);
/* Try the first one. */
/* To maintain the closure invairant, we first have to realise the
paths referenced by this one. */
queryReferences(storePath, references);
for (PathSet::iterator i = references.begin();
i != references.end(); ++i)
addWaitee(worker.makeSubstitutionGoal(*i));
if (waitees.empty()) /* to prevent hang (no wake-up event) */
referencesValid();
else
state = &SubstitutionGoal::referencesValid;
}
void SubstitutionGoal::referencesValid()
{
trace("all referenced realised");
if (nrFailed > 0)
throw Error(format("some references of path `%1%' could not be realised") % storePath);
for (PathSet::iterator i = references.begin();
i != references.end(); ++i)
assert(isValidPath(*i));
tryNext();
}

8
src/libstore/store.cc
View file

@ -265,8 +265,8 @@ void setReferences(const Transaction & txn, const Path & storePath,
void queryReferences(const Path & storePath, PathSet & references)
{
Paths references2;
if (!isValidPath(storePath))
throw Error(format("path `%1%' is not valid") % storePath);
// if (!isValidPath(storePath))
// throw Error(format("path `%1%' is not valid") % storePath);
nixDB.queryStrings(noTxn, dbReferences, storePath, references2);
references.insert(references2.begin(), references2.end());
}
@ -275,8 +275,8 @@ void queryReferences(const Path & storePath, PathSet & references)
void queryReferers(const Path & storePath, PathSet & referers)
{
Paths referers2;
if (!isValidPath(storePath))
throw Error(format("path `%1%' is not valid") % storePath);
// if (!isValidPath(storePath))
// throw Error(format("path `%1%' is not valid") % storePath);
nixDB.queryStrings(noTxn, dbReferers, storePath, referers2);
referers.insert(referers2.begin(), referers2.end());
}