From 79d3d7d9af534d12bb9445f22245f9e48b4a2269 Mon Sep 17 00:00:00 2001 From: Valerij Fredriksen Date: Fri, 6 May 2022 12:51:33 +0200 Subject: Revert "Set correct user on container crash path" --- .../hosted/node/admin/maintenance/coredump/CoredumpHandler.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'node-admin') 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 ab4c993bab9..2271991fa15 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; @@ -85,15 +84,9 @@ public class CoredumpHandler { public void converge(NodeAgentContext context, Supplier> nodeAttributesSupplier, boolean throwIfCoreBeingWritten) { - ContainerPath containerCrashPath = context.paths().of(crashPatchInContainer, context.users().vespa()); + ContainerPath containerCrashPath = context.paths().of(crashPatchInContainer); ContainerPath containerProcessingPath = containerCrashPath.resolve(PROCESSING_DIRECTORY_NAME); - // TODO (freva): Remove after 7.584 - UnixUser vespaUser = context.users().vespa(); - UnixPath processingPath = new UnixPath(containerProcessingPath); - if (processingPath.getOwnerId() != vespaUser.uid()) processingPath.setOwnerId(vespaUser.uid()); - if (processingPath.getGroupId() != vespaUser.gid()) processingPath.setGroupId(vespaUser.gid()); - updateMetrics(context, containerCrashPath); if (throwIfCoreBeingWritten) { -- cgit v1.2.3