From 7d3b6bac3c312e1bcc60228ab9b15af44d07c779 Mon Sep 17 00:00:00 2001
From: Geir Storli <geirst@verizonmedia.com>
Date: Tue, 7 Sep 2021 15:08:32 +0000
Subject: Add safeguards for num distributor stripes being set to -1.

---
 .../com/yahoo/vespa/model/content/Distributor.java     | 18 +++++++++++-------
 .../yahoo/vespa/model/content/ContentClusterTest.java  |  1 +
 2 files changed, 12 insertions(+), 7 deletions(-)

(limited to 'config-model')

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/Distributor.java b/config-model/src/main/java/com/yahoo/vespa/model/content/Distributor.java
index f0a2e52f6bf..b5fe4ddee41 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/Distributor.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/Distributor.java
@@ -49,14 +49,18 @@ public class Distributor extends ContentNode implements StorDistributormanagerCo
     }
 
     private int tuneNumDistributorStripes() {
-        if ((numDistributorStripesFlag == -1) && (getHostResource() != null)) {
-            int cores = (int)getHostResource().realResources().vcpu();
-            if (cores <= 16) {
-                return 1;
-            } else if (cores <= 64) {
-                return 2;
+        if (numDistributorStripesFlag == -1) {
+            if (getHostResource() != null) {
+                int cores = (int)getHostResource().realResources().vcpu();
+                if (cores <= 16) {
+                    return 1;
+                } else if (cores <= 64) {
+                    return 2;
+                } else {
+                    return 4;
+                }
             } else {
-                return 4;
+                return 1;
             }
         }
         return numDistributorStripesFlag;
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java
index c79238ed1d6..c7c02c581f9 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java
@@ -1079,6 +1079,7 @@ public class ContentClusterTest extends ContentBaseTest {
         assertEquals(0, resolveNumDistributorStripesConfigWithFeatureFlag(new TestProperties(), Optional.empty()));
         assertEquals(0, resolveNumDistributorStripesConfigWithFeatureFlag(0));
         assertEquals(1, resolveNumDistributorStripesConfigWithFeatureFlag(1));
+        assertEquals(1, resolveNumDistributorStripesConfigWithFeatureFlag(-1));
         assertEquals(4, resolveNumDistributorStripesConfigWithFeatureFlag(4));
     }
 
-- 
cgit v1.2.3