diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2019-11-14 12:47:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-14 12:47:10 +0100 |
| commit | 7f673f1f51da961fb768a879b4e889debced1e03 (patch) | |
| tree | 16e3629cce56e6c85444a0327b75c9fea51da6dd /controller-api | |
| parent | 479cb4523e0781500cf5c09ccc2694a08e5d1593 (diff) | |
| parent | 4c05924a45b3da8f7c2814717d794ae0ed230c91 (diff) | |
Merge pull request #11298 from vespa-engine/bjorncs/system-flags-improvement
Verify that 'flags' directory exists
Diffstat (limited to 'controller-api')
| -rw-r--r-- | controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/SystemFlagsDataArchive.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/SystemFlagsDataArchive.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/SystemFlagsDataArchive.java index ec14dcb7123..83e3c03ffaa 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/SystemFlagsDataArchive.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/SystemFlagsDataArchive.java @@ -62,6 +62,10 @@ public class SystemFlagsDataArchive { public static SystemFlagsDataArchive fromDirectory(Path directory) { Path root = directory.toAbsolutePath(); + Path flagsDirectory = directory.resolve("flags"); + if (!Files.isDirectory(flagsDirectory)) { + throw new IllegalArgumentException("Sub-directory 'flags' does not exist: " + flagsDirectory); + } try (Stream<Path> directoryStream = Files.walk(root)) { Builder builder = new Builder(); directoryStream.forEach(absolutePath -> { |