diff options
| author | Valerij Fredriksen <freva@users.noreply.github.com> | 2018-10-19 09:16:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-19 09:16:09 +0200 |
| commit | e460299f8f37cca9d119bfdd59db5deffdcaaf9b (patch) | |
| tree | cfee7e96a036e6ac4180e0d686ef5958c3df27a0 /node-admin | |
| parent | 1700fa27f85166c25af98316c4a695dd38c80ff8 (diff) | |
| parent | 9c13791e627d2094e42e70a2bb0c60b00011ff00 (diff) | |
Merge pull request #7357 from vespa-engine/revert-7311-freva/fix-yamas-permissions
Revert "NodeAdmin: Fix Yamas check permissions"
Diffstat (limited to 'node-admin')
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 171e47d33c5..85ec3712126 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 @@ -22,7 +22,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; @@ -42,7 +41,6 @@ import java.util.stream.Stream; import static com.yahoo.vespa.defaults.Defaults.getDefaults; 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; /** @@ -139,10 +137,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) { |