diff options
| author | Harald Musum <musum@yahooinc.com> | 2023-01-03 14:58:00 +0100 |
|---|---|---|
| committer | Harald Musum <musum@yahooinc.com> | 2023-01-03 14:58:00 +0100 |
| commit | 1fe5fdc8794e04b23653cc076c380f94c961cc40 (patch) | |
| tree | ea5b544d432d53942e56e9d3205fa544796e1dc6 /config-model/src/main/resources/schema | |
| parent | 028642b0a35645c086cda2a7fafa369b99f12476 (diff) | |
Log warning when deprecated jvm options used
Log when jvm-gc-options or allocated-memory attributes are used in
node element. Deprecate and tell that these will be removed in Vespa 9
Diffstat (limited to 'config-model/src/main/resources/schema')
| -rw-r--r-- | config-model/src/main/resources/schema/common.rnc | 4 | ||||
| -rw-r--r-- | config-model/src/main/resources/schema/containercluster.rnc | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/config-model/src/main/resources/schema/common.rnc b/config-model/src/main/resources/schema/common.rnc index fcd9a68ca89..538a8f069f5 100644 --- a/config-model/src/main/resources/schema/common.rnc +++ b/config-model/src/main/resources/schema/common.rnc @@ -1,8 +1,8 @@ # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. service.attlist &= attribute hostalias { xsd:NCName } service.attlist &= attribute baseport { xsd:unsignedShort }? -service.attlist &= attribute jvm-options { text }? -service.attlist &= attribute jvm-gc-options { text }? +service.attlist &= attribute jvm-options { text }? # Remove in Vespa 9 +service.attlist &= attribute jvm-gc-options { text }? # Remove in Vespa 9 # preload is for internal use only service.attlist &= attribute preload { text }? diff --git a/config-model/src/main/resources/schema/containercluster.rnc b/config-model/src/main/resources/schema/containercluster.rnc index 2bb93ac715e..933ec528c42 100644 --- a/config-model/src/main/resources/schema/containercluster.rnc +++ b/config-model/src/main/resources/schema/containercluster.rnc @@ -274,10 +274,10 @@ HttpClientApi = element http-client-api { # NODES: NodesOfContainerCluster = element nodes { - attribute jvm-options { text }? & - attribute jvm-gc-options { text }? & + attribute jvm-options { text }? & # Remove in Vespa 9 + attribute jvm-gc-options { text }? & # Remove in Vespa 9 attribute preload { text }? & - attribute allocated-memory { text }? & + attribute allocated-memory { text }? & # Remove in Vespa 9 attribute cpu-socket-affinity { xsd:boolean }? & element jvm { attribute options { text }? & |