Dispatch more requests in CD

1 files changed, 7 insertions, 3 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/NameServiceDispatcher.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/NameServiceDispatcher.java
index b47ed958c75..e57affdc15d 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/NameServiceDispatcher.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/NameServiceDispatcher.java
@@ -1,6 +1,7 @@
 // Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.controller.maintenance;
 
+import com.yahoo.config.provision.SystemName;
 import com.yahoo.vespa.hosted.controller.Controller;
 import com.yahoo.vespa.hosted.controller.api.integration.dns.NameService;
 import com.yahoo.vespa.hosted.controller.dns.NameServiceQueue;
@@ -18,15 +19,13 @@ import java.util.logging.Level;
  */
 public class NameServiceDispatcher extends ControllerMaintainer {
 
-    private static final int defaultRequestCount = 1;
-
     private final Clock clock;
     private final CuratorDb db;
     private final NameService nameService;
     private final int requestCount;
 
     public NameServiceDispatcher(Controller controller, Duration interval) {
-        this(controller, interval, defaultRequestCount);
+        this(controller, interval, requestCount(controller.system()));
     }
 
     public NameServiceDispatcher(Controller controller, Duration interval, int requestCount) {
@@ -58,4 +57,9 @@ public class NameServiceDispatcher extends ControllerMaintainer {
         return success;
     }
 
+    private static int requestCount(SystemName system) {
+        // Dispatch more requests at a time in CD as integration tests expect reasonably quick DNS changes
+        return system.isCd() ? 3 : 1;
+    }
+
 }