diff options
| author | Valerij Fredriksen <freva@users.noreply.github.com> | 2022-05-06 12:55:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-06 12:55:50 +0200 |
| commit | 95880e2aec2acd6ffe78b7e43d7ed58cda5c79b3 (patch) | |
| tree | 55155a2c485adc9f923c1ee65fdf9412c515b649 /node-admin | |
| parent | 929b55c8c3cc4702d1e32711c8943c8e3c949505 (diff) | |
Revert "Revert "Set correct user on container crash path""
Diffstat (limited to 'node-admin')
| -rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoredumpHandler.java | 9 |
1 files changed, 8 insertions, 1 deletions
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 2271991fa15..ab4c993bab9 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,6 +9,7 @@ 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; @@ -84,9 +85,15 @@ public class CoredumpHandler { public void converge(NodeAgentContext context, Supplier<Map<String, Object>> nodeAttributesSupplier, boolean throwIfCoreBeingWritten) { - ContainerPath containerCrashPath = context.paths().of(crashPatchInContainer); + 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); + if (processingPath.getOwnerId() != vespaUser.uid()) processingPath.setOwnerId(vespaUser.uid()); + if (processingPath.getGroupId() != vespaUser.gid()) processingPath.setGroupId(vespaUser.gid()); + updateMetrics(context, containerCrashPath); if (throwIfCoreBeingWritten) { |