Resolve config when we discover a new config generation is active

Calling configActivated() will end up in going through all delayed
responses, putting them on a queue and wait for configs to be resolved.
This happens with the same executor that call configActivated() so it
might end up in a deadlock. Resolving config immediately instead
should avoid this.

1 files changed, 2 insertions, 2 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..6d1229aedae 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
@@ -155,8 +155,8 @@ class GetConfigProcessor implements Runnable {
             rpcServer.delayResponse(request, context);
             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);
             }
         });
     }