summaryrefslogtreecommitdiffstats
path: root/node-admin
diff options
context:
space:
mode:
authorValerij Fredriksen <valerijf@yahooinc.com>2022-04-20 14:54:29 +0200
committerValerij Fredriksen <valerijf@yahooinc.com>2022-04-20 14:54:29 +0200
commit6ed4525333abefe4addbc35271d26eca744e17a8 (patch)
tree5001d928b54b05c4e9a39c205bfb12fa35a4e05a /node-admin
parent7ce24feed41e3cbb672aa599f7da3b079a35f88b (diff)
Revert "Chmod all files in container storage"
This reverts commit 2d111efed5a1c2a41fa5a047bdaae98d1b4ac74e.
Diffstat (limited to 'node-admin')
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java8
1 files changed, 3 insertions, 5 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
index 75977da369c..454dafb2384 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
@@ -29,7 +29,6 @@ import com.yahoo.vespa.hosted.node.admin.maintenance.servicedump.VespaServiceDum
import com.yahoo.vespa.hosted.node.admin.nodeadmin.ConvergenceException;
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.fs.ContainerPath;
import java.time.Clock;
import java.time.Duration;
@@ -142,8 +141,7 @@ public class NodeAgentImpl implements NodeAgent {
// TODO: Remove after this has rolled out everywhere
int[] stats = new int[]{0, 0, 0};
- ContainerPath vespaHome = initialContext.paths().underVespaHome("");
- FileFinder.files(initialContext.paths().of("/")).forEachPath(path -> {
+ FileFinder.files(initialContext.paths().underVespaHome("")).forEachPath(path -> {
UnixPath unixPath = new UnixPath(path);
String permissions = unixPath.getPermissions();
@@ -152,12 +150,12 @@ public class NodeAgentImpl implements NodeAgent {
stats[0]++;
}
- if (path.startsWith(vespaHome) && unixPath.getOwnerId() != initialContext.users().vespa().uid()) {
+ if (unixPath.getOwnerId() != initialContext.users().vespa().uid()) {
unixPath.setOwnerId(initialContext.users().vespa().uid());
stats[1]++;
}
- if (path.startsWith(vespaHome) && unixPath.getGroupId() != initialContext.users().vespa().gid()) {
+ if (unixPath.getGroupId() != initialContext.users().vespa().gid()) {
unixPath.setGroupId(initialContext.users().vespa().gid());
stats[2]++;
}