lee/heritrix3
1
0
Fork 0
mirror of https://github.com/internetarchive/heritrix3.git synced 2026-08-01 04:10:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

BdbModule#doCheckpoint - support forgetting all but latest checkpoint

Browse Source
This commit is contained in:
Noah Levitt
2013-08-28 11:22:37 -07:00
parent 8e7c26bc8f
commit 43bb42d346
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
commons/src/main/java/org/archive/bdb/BdbModule.java
+16 -1
View File
@@ -22,6 +22,7 @@ package org.archive.bdb;
import java.io.Closeable;
import java.io.File;
import java.io.FileFilter;
import java.io.FilenameFilter;
import java.io.IOException;
import java.io.ObjectOutputStream;
import java.io.Serializable;
@@ -46,6 +47,7 @@ import org.archive.util.FilesystemLinkMaker;
import org.archive.util.IdentityCacheable;
import org.archive.util.ObjectIdentityBdbManualCache;
import org.archive.util.ObjectIdentityCache;
import org.archive.util.TextUtils;
import org.archive.util.bdbje.EnhancedEnvironment;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.annotation.Autowired;
@@ -440,7 +442,7 @@ public class BdbModule implements Lifecycle, Checkpointable, Closeable, Disposab
public void startCheckpoint(Checkpoint checkpointInProgress) {}
public void doCheckpoint(Checkpoint checkpointInProgress) throws IOException {
public void doCheckpoint(final Checkpoint checkpointInProgress) throws IOException {
// First sync objectCaches
for (@SuppressWarnings("rawtypes") ObjectIdentityCache oic : oiCaches.values()) {
oic.sync();
@@ -499,6 +501,19 @@ public class BdbModule implements Lifecycle, Checkpointable, Closeable, Disposab
} catch (DatabaseException e) {
throw new IOException(e);
}
if (checkpointInProgress.getForgetAllButLatest()) {
File[] oldEnvCpDirs = dir.getFile().listFiles(new FilenameFilter() {
@Override
public boolean accept(File dir, String name) {
return !name.equals(checkpointInProgress.getName())
&& TextUtils.matches("cp\\d{5}-\\d{14}", name);
}
});
for (File d: oldEnvCpDirs) {
FileUtils.deleteDirectory(d);
}
}
}
@SuppressWarnings("unchecked")
commons/src/main/java/org/archive/checkpointing/Checkpoint.java
+1 -1
View File
@@ -174,7 +174,7 @@ public class Checkpoint implements InitializingBean {
return (new File(checkpointDirectory,Checkpoint.VALIDITY_STAMP_FILENAME)).exists();
}
private boolean forgetAllButLatest = false;
protected boolean forgetAllButLatest = false;
public void setForgetAllButLatest(boolean b) {
this.forgetAllButLatest = b;
}