motiejus
/
jgit
1
Fork 0
Code Releases Activity

Fix one case of missing object 

When a repository is being GCed and a concurrent push is received, there
is the possibility of having a missing object. This is due to the fact
that after the list of objects to delete is built, there is a window of
time when an unreferenced and ready to delete object can be referenced
by the incoming push. In that case, the object would be deleted because
there is no way to know it is no longer unreferenced. This will leave
the repository in an inconsistent state and most of the operations fail
with a missing tree/object error.

Given the incoming push change the last modified date for the now
referenced object, verify this one is still a candidate to delete
before actually performing the delete operation.

Change-Id: Iadcb29b8eb24b0cb4bb9335b670443c138a60787
Signed-off-by: Hector Oswaldo Caballero <hector.caballero@ericsson.com>
This commit is contained in:
Hector Oswaldo Caballero 2016-12-13 07:38:39 -05:00 committed by hcaballero
parent 8f60297861
commit 4ddd4a3d1b
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java
View File

@ -430,9 +430,14 @@ public void prune(Set<ObjectId> objectsToKeep) throws IOException,
return;
// delete all candidates which have survived: these are unreferenced
// loose objects
for (File f : deletionCandidates.values())
f.delete();
// loose objects. Make a last check, though, to avoid deleting objects
// that could have been referenced while the candidates list was being
// built (by an incoming push, for example).
for (File f : deletionCandidates.values()) {
if (f.lastModified() < expireDate) {
f.delete();
}
}
repo.getObjectDatabase().close();
}