diff options
| author | Jon Bratseth <bratseth@oath.com> | 2020-01-07 13:42:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-07 13:42:23 +0100 |
| commit | 652d574634d756fadc1987b5209217c6d8f59819 (patch) | |
| tree | d97955ae0bb52c8b4fe008610a40f887114202b7 /config-model | |
| parent | 76fee3f4b68e1f9c8f46f10bb62ea3511686e96b (diff) | |
| parent | 27ca694a7eaade5ebb50ffdbaa29983bb740f274 (diff) | |
Merge pull request #11673 from vespa-engine/bratseth/more-error-information
More error information
Diffstat (limited to 'config-model')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/ml/ConvertedModel.java | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/ml/ConvertedModel.java b/config-model/src/main/java/com/yahoo/vespa/model/ml/ConvertedModel.java index 55979023119..1263b9bed6e 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/ml/ConvertedModel.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/ml/ConvertedModel.java @@ -118,21 +118,33 @@ public class ConvertedModel { RankProfile rankProfile, QueryProfileRegistry queryProfileRegistry, ImportedMlModel importedModel) { - ModelStore modelStore = new ModelStore(rankProfile.applicationPackage(), modelName); - return new ConvertedModel(modelName, - modelDescription, - convertAndStore(importedModel, rankProfile, queryProfileRegistry, modelStore), - Optional.of(importedModel)); + try { + ModelStore modelStore = new ModelStore(rankProfile.applicationPackage(), modelName); + return new ConvertedModel(modelName, + modelDescription, + convertAndStore(importedModel, rankProfile, queryProfileRegistry, modelStore), + Optional.of(importedModel)); + } + catch (IllegalArgumentException e) { + throw new IllegalArgumentException("In " + rankProfile + ": Could not create model '" + modelName + + " (" + modelDescription + ")", e); + } } public static ConvertedModel fromStore(ModelName modelName, String modelDescription, RankProfile rankProfile) { - ModelStore modelStore = new ModelStore(rankProfile.applicationPackage(), modelName); - return new ConvertedModel(modelName, - modelDescription, - convertStored(modelStore, rankProfile), - Optional.empty()); + try { + ModelStore modelStore = new ModelStore(rankProfile.applicationPackage(), modelName); + return new ConvertedModel(modelName, + modelDescription, + convertStored(modelStore, rankProfile), + Optional.empty()); + } + catch (IllegalArgumentException e) { + throw new IllegalArgumentException("In " + rankProfile + ": Could not create model '" + modelName + + " (" + modelDescription + ")", e); + } } /** |