diff options
author | Håkon Hallingstad <hakon@oath.com> | 2019-01-26 02:30:54 +0100 |
---|---|---|
committer | Håkon Hallingstad <hakon@oath.com> | 2019-01-26 02:30:54 +0100 |
commit | 5b51470fdf2eb245d509984047dc84ef3a7fae83 (patch) | |
tree | a310e85085feaf5624f826215af766dd4e704b42 /configserver-flags/pom.xml | |
parent | 5d126afb33df13888c58e5b43a79c893c23fb65b (diff) |
Read override file flags from file only once for config server
Up until now, every lookup of a flag in the ConfigServerFlagSource would
1. try to read 2 flag files under /etc/vespa/flags, causing exceptions
because they are typically not set, and
2. then read flag from ZooKeeper through ZooKeeperFlagSource
Optimization was deliberately held off until later (now). This PR fixes (1).
Changes the ConfigServerFlagSource to:
1'. Read VESPA_HOME/var/vespa/flag.db once during component graph
construction. As before, if a flag is defined on file, the flag is not
looked up in ZK, which may be useful in emergencies.
2. As before.
Also, removes the last usages of FileFlagSource and its reading of flags in
/etc/vespa/flags.
Diffstat (limited to 'configserver-flags/pom.xml')
-rw-r--r-- | configserver-flags/pom.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/configserver-flags/pom.xml b/configserver-flags/pom.xml index a55a8db5f56..8c96512c4c0 100644 --- a/configserver-flags/pom.xml +++ b/configserver-flags/pom.xml @@ -63,6 +63,12 @@ <!-- test --> <dependency> <groupId>com.yahoo.vespa</groupId> + <artifactId>defaults</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> <artifactId>testutil</artifactId> <version>${project.version}</version> <scope>test</scope> |