Keep some file references and download even if they have not been used for some time

1 files changed, 50 insertions, 11 deletions

diff --git a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/filedistribution/FileReferencesAndDownloadsMaintainerTest.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/filedistribution/FileReferencesAndDownloadsMaintainerTest.java
index fad021c0119..19e2d99c3ae 100644
--- a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/filedistribution/FileReferencesAndDownloadsMaintainerTest.java
+++ b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/filedistribution/FileReferencesAndDownloadsMaintainerTest.java
@@ -10,6 +10,9 @@ import java.io.File;
 import java.io.IOException;
 import java.time.Duration;
 import java.time.Instant;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.IntStream;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -19,9 +22,12 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
  */
 public class FileReferencesAndDownloadsMaintainerTest {
 
+    private static final Duration keepDuration = Duration.ofMinutes(1);
+    private static final int outDatedFilesToKeep = 9;
+
     private File cachedFileReferences;
     private File cachedDownloads;
-    private FileReferencesAndDownloadsMaintainer cachedFilesMaintainer;
+    private FileReferencesAndDownloadsMaintainer maintainer;
 
     @TempDir
     public File tempFolder;
@@ -30,22 +36,55 @@ public class FileReferencesAndDownloadsMaintainerTest {
     public void setup() throws IOException {
         cachedFileReferences = newFolder(tempFolder, "cachedFileReferences");
         cachedDownloads = newFolder(tempFolder, "cachedDownloads");
-        cachedFilesMaintainer = new FileReferencesAndDownloadsMaintainer(cachedFileReferences, cachedDownloads, Duration.ofMinutes(1));
+        maintainer = new FileReferencesAndDownloadsMaintainer(cachedFileReferences, cachedDownloads, keepDuration, outDatedFilesToKeep);
     }
 
     @Test
-    void require_old_files_to_be_deleted() throws IOException {
+    void require_old_files_to_be_deleted() {
         runMaintainerAndAssertFiles(0, 0);
 
-        File fileReference = writeFile(cachedFileReferences, "fileReference");
-        File download = writeFile(cachedDownloads, "download");
-        runMaintainerAndAssertFiles(1, 1);
+        var fileReferences = writeFiles(20);
+        var downloads = writeDownloads(21);
+        runMaintainerAndAssertFiles(20, 21);
 
-        updateLastModifiedTimeStamp(fileReference, Instant.now().minus(Duration.ofMinutes(10)));
-        runMaintainerAndAssertFiles(0, 1);
+        updateLastModifiedTimestamp(0, 5, fileReferences, downloads);
+        runMaintainerAndAssertFiles(15, 16);
 
-        updateLastModifiedTimeStamp(download, Instant.now().minus(Duration.ofMinutes(10)));
-        runMaintainerAndAssertFiles(0, 0);
+        updateLastModifiedTimestamp(6, 20, fileReferences, downloads);
+        // Should keep at least outDatedFilesToKeep file references and downloads even if there are more that are old
+        runMaintainerAndAssertFiles(outDatedFilesToKeep, outDatedFilesToKeep);
+    }
+
+    private void updateLastModifiedTimestamp(int startInclusive, int endExclusive, List<File> fileReferences, List<File> downloads) {
+        IntStream.range(startInclusive, endExclusive).forEach(i -> {
+            Instant instant = Instant.now().minus(keepDuration.plus(Duration.ofMinutes(1)).minus(Duration.ofSeconds(i)));
+            updateLastModifiedTimeStamp(fileReferences.get(i), instant);
+            updateLastModifiedTimeStamp(downloads.get(i), instant);
+        });
+    }
+
+    private List<File> writeFiles(int count) {
+        List<File> files = new ArrayList<>();
+        IntStream.range(0, count).forEach(i -> {
+            try {
+                files.add(writeFile(cachedFileReferences, "fileReference" + i));
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        });
+        return files;
+    }
+
+    private List<File> writeDownloads(int count) {
+        List<File> files = new ArrayList<>();
+        IntStream.range(0, count).forEach(i -> {
+            try {
+                files.add(writeFile(cachedDownloads, "download" + i));
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        });
+        return files;
     }
 
     private void updateLastModifiedTimeStamp(File file, Instant instant) {
@@ -55,7 +94,7 @@ public class FileReferencesAndDownloadsMaintainerTest {
     }
 
     private void runMaintainerAndAssertFiles(int fileReferenceCount, int downloadCount) {
-        cachedFilesMaintainer.run();
+        maintainer.run();
         File[] fileReferences = cachedFileReferences.listFiles();
         assertNotNull(fileReferences);
         assertEquals(fileReferenceCount, fileReferences.length);