Sync up to 100 files when in dirty, including unrotated ones

1 files changed, 8 insertions, 5 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/sync/SyncFileInfo.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/sync/SyncFileInfo.java
index 55ead4ad737..cf7f54ae0f5 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/sync/SyncFileInfo.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/sync/SyncFileInfo.java
@@ -35,16 +35,19 @@ public class SyncFileInfo {
         return uploadCompression;
     }
 
-    public static Optional<SyncFileInfo> forLogFile(URI uri, Path logFile) {
+    public static Optional<SyncFileInfo> forLogFile(URI uri, Path logFile, boolean rotatedOnly) {
         String filename = logFile.getFileName().toString();
-        Compression compression = Compression.NONE;
+        Compression compression;
         String dir = null;
 
-        if (filename.startsWith("vespa.log-")) {
+        if ((!rotatedOnly && filename.equals("vespa.log")) || filename.startsWith("vespa.log-")) {
             dir = "logs/vespa/";
             compression = Compression.ZSTD;
-        } else if (filename.endsWith(".zst")) {
-            if (filename.startsWith("JsonAccessLog.") || filename.startsWith("access"))
+        } else {
+            compression = filename.endsWith(".zst") ? Compression.NONE : Compression.ZSTD;
+            if (rotatedOnly && compression != Compression.NONE)
+                dir = null;
+            else if (filename.startsWith("JsonAccessLog.") || filename.startsWith("access"))
                 dir = "logs/access/";
             else if (filename.startsWith("ConnectionLog."))
                 dir = "logs/connection/";