From 569ae2c56a07160b7ef84f0c2ddd9847736adfc0 Mon Sep 17 00:00:00 2001
From: Arne Juul <arnej@yahooinc.com>
Date: Wed, 17 Jan 2024 09:55:32 +0000
Subject: run verify for streaming clusters as well

---
 .../model/application/validation/RankSetupValidator.java | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'config-model')

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java
index f2d9c0fcd1c..98adde7b547 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java
@@ -63,18 +63,14 @@ public class RankSetupValidator implements Validator {
                                                context.deployState().getProperties().applicationId().toFullString() +
                                                ".")
                     .toFile();
-            for (SearchCluster cluster : context.model().getSearchClusters()) {
-                // Skipping ranking expression checking for streaming clusters, not implemented yet
-                if (cluster.isStreaming()) continue;
-
-                IndexedSearchCluster sc = (IndexedSearchCluster) cluster;
+            for (SearchCluster sc : context.model().getSearchClusters()) {
                 String clusterDir = cfgDir.getAbsolutePath() + "/" + sc.getClusterName() + "/";
                 for (DocumentDatabase docDb : sc.getDocumentDbs()) {
                     String schemaName = docDb.getDerivedConfiguration().getSchema().getName();
                     String schemaDir = clusterDir + schemaName + "/";
                     writeConfigs(schemaDir, docDb);
                     writeExtraVerifyRankSetupConfig(schemaDir, docDb);
-                    if (!validate(context, "dir:" + schemaDir, sc, schemaName, cfgDir)) {
+                    if (!validate(context, "dir:" + schemaDir, sc, schemaName, cfgDir, sc.isStreaming())) {
                         return;
                     }
                 }
@@ -87,11 +83,11 @@ public class RankSetupValidator implements Validator {
         }
     }
 
-    private boolean validate(Context context, String configId, SearchCluster searchCluster, String schema, File tempDir) {
+    private boolean validate(Context context, String configId, SearchCluster searchCluster, String schema, File tempDir, boolean isStreaming) {
         Instant start = Instant.now();
         try {
             log.log(Level.FINE, () -> String.format("Validating schema '%s' for cluster %s with config id %s", schema, searchCluster, configId));
-            boolean ret = execValidate(context, configId, searchCluster, schema);
+            boolean ret = execValidate(context, configId, searchCluster, schema, isStreaming);
             if (!ret) {
                 // Give up, don't log same error msg repeatedly
                 deleteTempDir(tempDir);
@@ -175,8 +171,8 @@ public class RankSetupValidator implements Validator {
         IOUtils.writeFile(dir + configName, StringUtilities.implodeMultiline(ConfigInstance.serialize(config)), false);
     }
 
-    private boolean execValidate(Context context, String configId, SearchCluster sc, String sdName) {
-        String command = String.format("%s %s", binaryName, configId);
+    private boolean execValidate(Context context, String configId, SearchCluster sc, String sdName, boolean isStreaming) {
+        String command = String.format((isStreaming ? "%s %s -S" : "%s %s"), binaryName, configId);
         try {
             Pair<Integer, String> ret = new ProcessExecuter(true).exec(command);
             Integer exitCode = ret.getFirst();
-- 
cgit v1.2.3