summaryrefslogtreecommitdiffstats
path: root/config-proxy
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@gmail.com>2020-12-16 22:15:52 +0100
committerJon Bratseth <bratseth@gmail.com>2020-12-16 22:15:52 +0100
commitb194c494bc568ced02a98695bc41219b170acf37 (patch)
tree0e22193a21aeddb945663795232066c44fc2e3eb /config-proxy
parent99ad735154f1aa3cd40b7d7028c11bf19225d1b3 (diff)
Track explicitly when we are initializing config
Diffstat (limited to 'config-proxy')
-rw-r--r--config-proxy/src/main/java/com/yahoo/vespa/config/proxy/Subscriber.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/Subscriber.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/Subscriber.java
index f96d6470679..e79497e0dd3 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/Subscriber.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/Subscriber.java
@@ -43,7 +43,7 @@ public class Subscriber {
}
public Optional<RawConfig> nextGeneration() {
- if (subscriber.nextGeneration(0)) {
+ if (subscriber.nextGeneration(0, true)) { // Proxy should never skip config due to not initializing
try {
return Optional.of(handle.getRawConfig());
} catch (Exception e) { // To avoid thread throwing exception and loop never running this again