Merge pull request #22532 from vespa-engine/freva/fix-todo

Remove temporary processing coredumps directory chown

2 files changed, 1 insertions, 10 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArtifactExpirer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArtifactExpirer.java
index 81fbb85e3d7..439f1aa9a09 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArtifactExpirer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArtifactExpirer.java
@@ -53,7 +53,7 @@ public class ArtifactExpirer extends ControllerMaintainer {
                     .filter(artifact -> isExpired(artifact, now, versionStatus))
                     .collect(Collectors.toList());
             if (!artifactsToExpire.isEmpty()) {
-                log.log(Level.INFO, "Expiring " + artifactsToExpire.size() + " artifacts: " + artifactsToExpire);
+                log.log(Level.INFO, "Expiring " + artifactsToExpire.size() + " artifacts in " + cloudName + ": " + artifactsToExpire);
                 artifactRegistry.deleteAll(artifactsToExpire);
             }
             return 1;
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoredumpHandler.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoredumpHandler.java
index 0d0b8bd335e..3004fb6490b 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoredumpHandler.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoredumpHandler.java
@@ -9,7 +9,6 @@ import com.yahoo.vespa.hosted.node.admin.nodeadmin.ConvergenceException;
 import com.yahoo.vespa.hosted.node.admin.nodeagent.NodeAgentContext;
 import com.yahoo.vespa.hosted.node.admin.task.util.file.FileFinder;
 import com.yahoo.vespa.hosted.node.admin.task.util.file.UnixPath;
-import com.yahoo.vespa.hosted.node.admin.task.util.file.UnixUser;
 import com.yahoo.vespa.hosted.node.admin.task.util.fs.ContainerPath;
 import com.yahoo.vespa.hosted.node.admin.task.util.process.Terminal;
 
@@ -88,14 +87,6 @@ public class CoredumpHandler {
         ContainerPath containerCrashPath = context.paths().of(crashPatchInContainer, context.users().vespa());
         ContainerPath containerProcessingPath = containerCrashPath.resolve(PROCESSING_DIRECTORY_NAME);
 
-        // TODO (freva): Remove after 7.584
-        UnixUser vespaUser = context.users().vespa();
-        UnixPath processingPath = new UnixPath(containerProcessingPath);
-        processingPath.getAttributesIfExists().ifPresent(attr -> {
-            if (attr.ownerId() != vespaUser.uid()) processingPath.setOwnerId(vespaUser.uid());
-            if (attr.groupId() != vespaUser.gid()) processingPath.setGroupId(vespaUser.gid());
-        });
-
         updateMetrics(context, containerCrashPath);
 
         if (throwIfCoreBeingWritten) {