diff options
author | Valerij Fredriksen <freva@users.noreply.github.com> | 2018-10-18 11:47:03 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-18 11:47:03 +0200 |
commit | 9c13791e627d2094e42e70a2bb0c60b00011ff00 (patch) | |
tree | 3fdf6b35ed935a2619dc044f75cf8ee44f9f3795 /node-admin/src | |
parent | 3bae776c5c49634a5479aa171b918d5fdf3a2278 (diff) |
Revert "NodeAdmin: Fix Yamas check permissions"
Diffstat (limited to 'node-admin/src')
2 files changed, 0 insertions, 10 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 2b235ac9867..6a9f0a69249 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 @@ -17,7 +17,6 @@ import java.io.IOException; import java.io.InputStreamReader; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.attribute.PosixFilePermissions; import java.time.Duration; import java.time.Instant; import java.time.ZoneOffset; @@ -34,7 +33,6 @@ import java.util.regex.Pattern; import static com.yahoo.vespa.hosted.node.admin.task.util.file.FileFinder.nameMatches; import static com.yahoo.vespa.hosted.node.admin.task.util.file.FileFinder.olderThan; -import static com.yahoo.vespa.hosted.node.admin.task.util.file.IOExceptionUtil.ifExists; import static com.yahoo.vespa.hosted.node.admin.task.util.file.IOExceptionUtil.uncheck; /** @@ -126,10 +124,6 @@ public class StorageMaintainer { // Write config and restart yamas-agent Path yamasAgentFolder = context.pathOnHostFromPathInNode("/etc/yamas-agent"); - - // TODO: Remove after 6.301 - ifExists(() -> Files.setPosixFilePermissions(yamasAgentFolder, PosixFilePermissions.fromString("rw-r--r--"))); - configs.forEach(s -> uncheck(() -> s.writeTo(yamasAgentFolder))); dockerOperations.executeCommandInContainerAsRoot(context, "service", "yamas-agent", "restart"); } diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/util/SecretAgentCheckConfig.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/util/SecretAgentCheckConfig.java index c5db0e39009..6e679af4449 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/util/SecretAgentCheckConfig.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/util/SecretAgentCheckConfig.java @@ -7,7 +7,6 @@ import com.yahoo.vespa.hosted.node.admin.task.util.file.FileWriter; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.attribute.PosixFilePermissions; import java.util.LinkedHashMap; import java.util.Map; @@ -50,9 +49,6 @@ public class SecretAgentCheckConfig { Files.createDirectories(yamasAgentDirectory); Path scheduleFilePath = yamasAgentDirectory.resolve(id + ".yaml"); Files.write(scheduleFilePath, render().getBytes()); - - // TODO: Remove after 6.301 - Files.setPosixFilePermissions(scheduleFilePath, PosixFilePermissions.fromString("rw-r--r--")); } public FileWriter getFileWriterTo(Path destinationPath) { |