Merge pull request #17501 from vespa-engine/arnej/always-run-prepare-restart

let the sentinel run the RPC call for prepare-restart on content nodes.

2 files changed, 3 insertions, 3 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java
index 6f7709efc24..a4322976992 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java
@@ -121,7 +121,7 @@ public class ContentSearchCluster extends AbstractConfigProducer<SearchCluster>
             if (flushOnShutdownElem != null) {
                 return flushOnShutdownElem;
             }
-            return ! stateIsHosted(deployState);
+            return true;
         }
 
         private Double getQueryTimeout(ModelElement clusterElem) {
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 811e789752e..5ffade0776a 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
@@ -790,8 +790,8 @@ public class ContentClusterTest extends ContentBaseTest {
     }
 
     @Test
-    public void flush_on_shutdown_is_default_off_for_hosted() throws Exception {
-        assertNoPreShutdownCommand(createOneNodeCluster(true));
+    public void flush_on_shutdown_is_default_on_for_hosted() throws Exception {
+        assertPrepareRestartCommand(createOneNodeCluster(true));
     }
 
     @Test