2 files changed, 9 insertions, 3 deletions

diff --git a/config/src/vespa/config/frt/frtconfigrequestfactory.h b/config/src/vespa/config/frt/frtconfigrequestfactory.h
index 9c1186263e0..d2db71ffa6d 100644
--- a/config/src/vespa/config/frt/frtconfigrequestfactory.h
+++ b/config/src/vespa/config/frt/frtconfigrequestfactory.h
@@ -11,7 +11,7 @@ namespace config {
 class FRTConfigRequest;
 class ConfigKey;
 class Connection;
-class ConfigState;
+struct ConfigState;
 
 /**
  * Factory for creating config requests depending on protocol version;
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDirectory.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDirectory.java
index d836eb8111f..f4cb7bc1fba 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDirectory.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDirectory.java
@@ -3,8 +3,6 @@ package com.yahoo.vespa.config.server.filedistribution;
 
 import com.yahoo.config.FileReference;
 import com.yahoo.io.IOUtils;
-import java.util.logging.Level;
-
 import com.yahoo.text.Utf8;
 import net.jpountz.xxhash.XXHash64;
 import net.jpountz.xxhash.XXHashFactory;
@@ -19,6 +17,9 @@ import java.nio.channels.FileChannel;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.attribute.BasicFileAttributes;
+import java.nio.file.attribute.FileTime;
+import java.time.Instant;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 public class FileDirectory  {
@@ -118,6 +119,11 @@ public class FileDirectory  {
                     "' has content that does not match its hash, deleting everything in " +
                     destinationDir.getAbsolutePath());
             IOUtils.recursiveDeleteDir(destinationDir);
+        } else {
+            // Update last access time (used to keep track of when we can delete unused file references
+            // so update when adding and it already exists)
+            FileTime fileTime = FileTime.from(Instant.now());
+            Files.setAttribute(destinationDir.toPath(), "basic:lastAccessTime", fileTime);
         }
     }