aboutsummaryrefslogtreecommitdiffstats
path: root/config-model/src
diff options
context:
space:
mode:
authorHarald Musum <musum@yahooinc.com>2023-12-09 21:13:50 +0100
committerHarald Musum <musum@yahooinc.com>2023-12-09 21:13:50 +0100
commit6fe24af8450a78b97bb2dccfd53cfa80cfdb7f65 (patch)
tree4aab2e9d566efa0adb4783b3ce652fb20d8c09ec /config-model/src
parent8ee864d6a1ffed020d5d2e6158b49ba8037e6ebb (diff)
Fix comparison of options
Diffstat (limited to 'config-model/src')
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/RestartOnDeployForOnnxModelChangesValidator.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/RestartOnDeployForOnnxModelChangesValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/RestartOnDeployForOnnxModelChangesValidator.java
index 64ada801be2..5f3dbb07479 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/RestartOnDeployForOnnxModelChangesValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/RestartOnDeployForOnnxModelChangesValidator.java
@@ -22,7 +22,7 @@ import static java.util.logging.Level.FINE;
*/
public class RestartOnDeployForOnnxModelChangesValidator implements ChangeValidator {
- private static final Logger log = Logger.getLogger(RestartOnDeployForOnnxModelChangesValidator.class.getSimpleName());
+ private static final Logger log = Logger.getLogger(RestartOnDeployForOnnxModelChangesValidator.class.getName());
@Override
public List<ConfigChangeAction> validate(VespaModel currentModel, VespaModel nextModel, DeployState deployState) {
@@ -60,7 +60,9 @@ public class RestartOnDeployForOnnxModelChangesValidator implements ChangeValida
private Optional<String> modelChanged(OnnxModelCost.ModelInfo a, OnnxModelCost.ModelInfo b) {
if (a.estimatedCost() != b.estimatedCost()) return Optional.of("estimated cost");
if (a.hash() != b.hash()) return Optional.of("model hash");
- if (! a.onnxModelOptions().equals(b.onnxModelOptions())) return Optional.of("model option(s)");
+ if (a.onnxModelOptions().isPresent() && b.onnxModelOptions().isPresent()
+ && ! a.onnxModelOptions().get().equals(b.onnxModelOptions().get()))
+ return Optional.of("model option(s)");
return Optional.empty();
}