diff options
| author | Valerij Fredriksen <valerijf@verizonmedia.com> | 2020-01-21 10:42:06 +0100 |
|---|---|---|
| committer | Valerij Fredriksen <valerijf@verizonmedia.com> | 2020-01-21 10:42:06 +0100 |
| commit | d973878b4e37bcbf7e523e475b90cfb1a166d286 (patch) | |
| tree | 0279679951456da37d21e9f0f0272fb36f172447 /node-repository | |
| parent | 98bf5f13a5939fc163b6aa7aa9699698099d7ce0 (diff) | |
Do not in-place resize in dynamically provisioned zones
Diffstat (limited to 'node-repository')
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java | 3 |
1 files changed, 2 insertions, 1 deletions
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)) { |