diff options
author | Harald Musum <musum@yahooinc.com> | 2023-03-03 19:47:19 +0100 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2023-03-03 19:47:19 +0100 |
commit | 1c9d2acca42e2087f2a8f3e77ba1ff23ae1d307c (patch) | |
tree | 85e35c29a50c689764e13d28685eb7ffacdfdaa9 | |
parent | 198be96c9538306a8ad670d72ce586c65c2a827b (diff) |
Don't delay response if we resolve config a second time
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java index 6d1229aedae..c916a429599 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java @@ -152,12 +152,12 @@ class GetConfigProcessor implements Runnable { delayed.ifPresent(d -> { GetConfigContext context = d.context(); - rpcServer.delayResponse(request, context); - if (rpcServer.hasNewerGeneration(context.applicationId(), d.generation())) { + if (rpcServer.hasNewerGeneration(context.applicationId(), d.generation())) // This will ensure that if the config activation train left the station while I was boarding, // we will resolve config again with new generation resolveConfig(request); - } + else + rpcServer.delayResponse(request, context); }); } |