lix-project/lix
20
57
Fork 31
Code Issues 350 Code Review (Gerrit) Projects 3 Releases Wiki Activity

nix-env: Minor change to '--delete-generations Nd' semantics

Browse source 
The option '--delete-generations Nd' deletes all generations older than N
days. However, most likely the user does not want to delete the
generation that was active N days ago.

For example, say that you have these 3 generations:

1: <30 days ago>
2: <15 days ago>
3: <1 hour ago>

If you do --delete-generations 7d (say, as part of a cron job), most
likely you still want to keep generation 2, i.e. the generation that was
active 7 days ago (and for most of the past 7 days, in fact).

This patch fixes this issue. Note that this also affects
'nix-collect-garbage --delete-older-than Nd'.

Thanks to @roconnor for noticing the issue!
This commit is contained in:
Ricardo M. Correia 2014-04-11 17:10:20 +02:00 committed by Eelco Dolstra
parent fb5d76b89e
commit 700c678c2e
3 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
doc/manual/nix-collect-garbage.xml
View file

@ -45,8 +45,9 @@ which deletes all old generations of all profiles in
impossible); and impossible); and
<option>--delete-older-than</option> <replaceable>period</replaceable>, <option>--delete-older-than</option> <replaceable>period</replaceable>,
where period is a value such as <literal>30d</literal>, which deletes where period is a value such as <literal>30d</literal>, which deletes
all non-current generations that are older than the specified number of all generations older than the specified number of days in all profiles
days in all profiles in <filename>/nix/var/nix/profiles</filename>. in <filename>/nix/var/nix/profiles</filename> (except for the generations
that were active at that point in time).
</para> </para>
</refsection> </refsection>

3
doc/manual/nix-env.xml
View file

@ -1170,7 +1170,8 @@ $ nix-env --list-generations
profile. The generations can be a list of generation numbers, the profile. The generations can be a list of generation numbers, the
special value <literal>old</literal> to delete all non-current special value <literal>old</literal> to delete all non-current
generations, or a value such as <literal>30d</literal> to delete all generations, or a value such as <literal>30d</literal> to delete all
non-current generations older than the specified number of days. generations older than the specified number of days (except for the
generation that was active at that point in time).
Periodically deleting old generations is important to make garbage Periodically deleting old generations is important to make garbage
collection effective.</para> collection effective.</para>

14
src/nix-env/nix-env.cc
View file

@ -1315,11 +1315,17 @@ static void opDeleteGenerations(Globals & globals,
oldTime = curTime - days * 24 * 3600; oldTime = curTime - days * 24 * 3600;
for (Generations::iterator j = gens.begin(); j != gens.end(); ++j) { bool canDelete = false;
if (j->number == curGen) continue; for (Generations::reverse_iterator j = gens.rbegin(); j != gens.rend(); ++j) {
if (canDelete) {
if (j->creationTime < oldTime) assert(j->creationTime < oldTime);
deleteGeneration2(globals, j->number); deleteGeneration2(globals, j->number);
} else if (j->creationTime < oldTime) {
/* We may now start deleting generations, but we don't delete
this generation yet, because this generation was still the
one that was active at the requested point in time. */
canDelete = true;
}
} }
} else { } else {
int n; int n;