Recreate container FS root after archive for non-tenant nodes

1 files changed, 6 insertions, 0 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java
index dd0b8a2acdc..ac4d58374c1 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java
@@ -214,6 +214,12 @@ public class StorageMaintainer {
             containerLogsOnHost.moveIfExists(containerLogsInArchiveDir);
         }
         new UnixPath(context.paths().of("/")).deleteRecursively();
+
+        // Container FS root cannot be created from ContainerPath, it is therefore important that it exists as long as
+        // NodeAgent is running. Normally the root is only created when NodeAgent is first started. Because non-tenant
+        // nodes are never removed from node-repo, we immediately re-create the new root after archiving the previous
+        if (context.nodeType() != NodeType.tenant)
+            context.paths().of("/").getFileSystem().createRoot();
     }
 
     private String getMicrocodeVersion() {