When disabled, all document types give empty status

3 files changed, 23 insertions, 1 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationCuratorDatabase.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationCuratorDatabase.java
index eb294e6a1b9..4cd112606c0 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationCuratorDatabase.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationCuratorDatabase.java
@@ -116,7 +116,7 @@ public class ApplicationCuratorDatabase {
 
     public Optional<ApplicationReindexing> readReindexingStatus(ApplicationId id) {
         return curator.getData(reindexingDataPath(id))
-                      .map(data -> ReindexingStatusSerializer.fromBytes(data));
+                      .map(ReindexingStatusSerializer::fromBytes);
     }
 
     public void writeReindexingStatus(ApplicationId id, ApplicationReindexing status) {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationReindexing.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationReindexing.java
index ecda8cbcde9..baec335b5bc 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationReindexing.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationReindexing.java
@@ -87,6 +87,9 @@ public class ApplicationReindexing implements Reindexing {
 
     @Override
     public Optional<Reindexing.Status> status(String cluster, String documentType) {
+        if ( ! enabled)
+            return Optional.empty();
+
         if (clusters.containsKey(cluster)) {
             if (clusters.get(cluster).pending().containsKey(documentType))
                 return Optional.empty();
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationReindexingTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationReindexingTest.java
index 82de3e2eefb..cf451c45251 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationReindexingTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationReindexingTest.java
@@ -69,6 +69,25 @@ public class ApplicationReindexingTest {
 
         assertEquals(Map.of("b", 20L),
                      reindexing.clusters().get("two").pending());
+
+        reindexing = reindexing.enabled(false);
+
+        // When disabled, status of any document type is empty.
+        assertEquals(Optional.empty(),
+                     reindexing.status("one", "a"));
+
+        assertEquals(Optional.empty(),
+                     reindexing.status("one", "d"));
+
+        assertEquals(Optional.empty(),
+                     reindexing.status("two", "d"));
+
+        assertEquals(Optional.empty(),
+                     reindexing.status("three", "a"));
+
+        assertEquals(Optional.empty(),
+                     reindexing.status("two", "b"));
+
     }
 
 }