diff options
| author | Kristian Aune <kkraune@users.noreply.github.com> | 2017-07-07 16:12:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-07 16:12:47 +0200 |
| commit | e522f9accfee1a5b616d284dffb5d035ffc0a5d3 (patch) | |
| tree | e45d47965af0f86e178e062884464b8d4cc1a9a3 | |
| parent | b2ded598f19b80ecdee3cb1a7bb53ee17a63fba5 (diff) | |
| parent | 76e107e46536ddbd62ed42bfc3d82d01b9bea7f9 (diff) | |
Merge pull request #2871 from yahoo/balder/warn-on-body-header
Emit warning when header/body is used in .sd file.
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java | 4 | ||||
| -rw-r--r-- | config-model/src/main/javacc/SDParser.jj | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java index dbdbb8c58aa..1dc4bdf4259 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java @@ -130,6 +130,10 @@ public class ContentCluster extends AbstractConfigProducer implements StorDistri throw new RuntimeException("If you have indexed search you need to have proton as engine"); } + if (c.isMemfilePersistence()) { + admin.deployLogger().log(Level.WARNING, "'vds' engine is deprecated and will soon be removed. 'proton' is only recommended engine."); + } + if (documentsElement != null) { ModelElement e = documentsElement.getChild("document-processing"); if (e != null) { diff --git a/config-model/src/main/javacc/SDParser.jj b/config-model/src/main/javacc/SDParser.jj index 33aa0eb8273..916a905dfcb 100644 --- a/config-model/src/main/javacc/SDParser.jj +++ b/config-model/src/main/javacc/SDParser.jj @@ -1493,6 +1493,7 @@ void body(SDField field) : { } { <BODY> { + deployLogger.log(Level.WARNING, field + ": 'header/body' is deprecated and has no effect unless using deprecated vds engine."); field.setHeader(false); field.setHeaderOrBodyDefined(true); } @@ -1507,6 +1508,7 @@ void header(SDField field) : { } { <HEADER> { + deployLogger.log(Level.WARNING, field + ": 'header/body' is deprecated and has no effect unless using deprecated vds engine."); field.setHeader(true); field.setHeaderOrBodyDefined(true); } |