Merge pull request #26288 from vespa-engine/hmusum/resolve-config-when-we-discover-that-a-new-config-generation-is-active

Resolve config when we discover a new config generation is active

1 files changed, 5 insertions, 5 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 5e7fff8c922..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,
-                // another train will immediately be scheduled.
-                rpcServer.configActivated(context.applicationId());
-            }
+                // we will resolve config again with new generation
+                resolveConfig(request);
+            else
+                rpcServer.delayResponse(request, context);
         });
     }