From d973878b4e37bcbf7e523e475b90cfb1a166d286 Mon Sep 17 00:00:00 2001
From: Valerij Fredriksen <valerijf@verizonmedia.com>
Date: Tue, 21 Jan 2020 10:42:06 +0100
Subject: Do not in-place resize in dynamically provisioned zones

---
 .../com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java
index eab8bb68863..9cc4b3f3bdb 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java
@@ -65,9 +65,10 @@ public class GroupPreparer {
         boolean dynamicProvisioningEnabled = hostProvisioner.isPresent() && dynamicProvisioningEnabledFlag
                 .with(FetchVector.Dimension.APPLICATION_ID, application.serializedForm())
                 .value();
+        // Do not in-place resize in dynamically provisioned zones
         boolean inPlaceResizeEnabled = enableInPlaceResize
                 .with(FetchVector.Dimension.APPLICATION_ID, application.serializedForm())
-                .value();
+                .value() && !dynamicProvisioningEnabled;
 
         try (Mutex lock = nodeRepository.lock(application)) {
 
-- 
cgit v1.2.3