diff --git a/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/store/jdbc/request/JdbcBulkRequestArchiver.java b/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/store/jdbc/request/JdbcBulkRequestArchiver.java index fd9039fdd49..22c1d9767dd 100644 --- a/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/store/jdbc/request/JdbcBulkRequestArchiver.java +++ b/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/store/jdbc/request/JdbcBulkRequestArchiver.java @@ -61,7 +61,6 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING import static org.dcache.services.bulk.BulkRequestStatus.CANCELLED; import static org.dcache.services.bulk.BulkRequestStatus.COMPLETED; -import static org.dcache.services.bulk.BulkRequestStatus.INCOMPLETE; import dmg.cells.nucleus.CellInfoProvider; import java.io.PrintWriter; @@ -160,7 +159,7 @@ public void run() { long threshhold = System.currentTimeMillis() - archiverWindowUnit.toMillis(archiverWindow); List expiredUids = requestDao.getUids( - requestDao.where().modifiedBefore(threshhold).status(INCOMPLETE, COMPLETED, CANCELLED), + requestDao.where().modifiedBefore(threshhold).status(COMPLETED, CANCELLED), Integer.MAX_VALUE); /* @@ -169,9 +168,9 @@ public void run() { expiredUids.forEach(this::insert); /* - * Delete all the out-of-date requests. + * Delete all the out-of-date requests which are terminal. */ - requestDao.delete(requestDao.where().modifiedBefore(threshhold)); + requestDao.delete(requestDao.where().modifiedBefore(threshhold).status(COMPLETED, CANCELLED)); lastRunCompleted = System.currentTimeMillis(); }