diff options
Diffstat (limited to 'container-core/src/main/resources/configdefinitions')
6 files changed, 3 insertions, 148 deletions
diff --git a/container-core/src/main/resources/configdefinitions/diagnostics.def b/container-core/src/main/resources/configdefinitions/diagnostics.def deleted file mode 100644 index 33f733d4386..00000000000 --- a/container-core/src/main/resources/configdefinitions/diagnostics.def +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -namespace=container.core - -## The fraction of queries to time out over a period of 10s to consider -## the system in breakdown. -timeoutfraction double default=0.1 - -## Minimum QPS to consider the system in breakdown. -minimumqps int default=1 - -## Whether to shut down process if in a deadlock situation -shutdown bool default=false - -## Whether to totally disable the detector. Alternative to system property -## which works better in tests. -disabled bool default=false diff --git a/container-core/src/main/resources/configdefinitions/qr-logging.def b/container-core/src/main/resources/configdefinitions/qr-logging.def deleted file mode 100644 index f828f321ae7..00000000000 --- a/container-core/src/main/resources/configdefinitions/qr-logging.def +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -namespace=container.core -logger string default="com.yahoo" -# Either QueryAccessLog for a regular Vespa access log, or YApacheAccessLog for a log on yApache format -speciallog[].name string - -# Leave as "" -speciallog[].type string - -speciallog[].filehandler.name string default="" - -# File name patterns supporting the expected time variables -speciallog[].filehandler.pattern string default=".%Y%m%d%H%M%S" - -speciallog[].filehandler.rotation string default="0 60 ..." - -# Defines how file rotation is done. There are two options: -# -# "date" : -# The active log file is given the name resulting from pattern (but in this case "pattern" must yield a -# time-dependent name. In addition, a symlink is created pointing to the newest file. -# The symlink is given the name of the symlink parameter (or the name of this service -# if no parameter is given. -# -# "sequence" : -# The active log file is given the name -# defined by "pattern" (which in this case will likely just be a constant string). -# At rotation, this file is given the name pattern.N where N is 1 + the largest integer found by -# extracting the integers from all files ending by .Integer in the same directory -# -speciallog[].filehandler.rotatescheme string default="date" - -# Use this as the name of the symlink created pointing to the newest file in the "date" naming scheme. -# This is ignored if the sequence naming scheme is used. -speciallog[].filehandler.symlink string default="" - -speciallog[].cachehandler.name string default="" -speciallog[].cachehandler.size int default=1000 diff --git a/container-core/src/main/resources/configdefinitions/qr-searchers.def b/container-core/src/main/resources/configdefinitions/qr-searchers.def index e2b4836c081..bb8f80052f1 100644 --- a/container-core/src/main/resources/configdefinitions/qr-searchers.def +++ b/container-core/src/main/resources/configdefinitions/qr-searchers.def @@ -14,6 +14,8 @@ com.yahoo.prelude.searcher.FieldCollapsingSearcher.extrafactor double default=2. com.yahoo.prelude.searcher.FieldCollapsingSearcher.collapsefield string default="mid" com.yahoo.prelude.searcher.BlendingSearcher.numthreads int default=200 + +# The field we'll unique on, use [id] to unique on the document id com.yahoo.prelude.searcher.BlendingSearcher.docid string default="" com.yahoo.prelude.searcher.JuniperSearcher.source string default="" @@ -74,8 +76,5 @@ searchcluster[].storagecluster.routespec string default="" searchcluster[].dispatcher[].host string searchcluster[].dispatcher[].port int -## Not used. TODO: Remove on Vespa 7 -searchcluster[].rowbits int default=0 - # Per dispatcher config-id might be nice to have, remove it until needed. # searchcluster[].dispatcher[].configid reference diff --git a/container-core/src/main/resources/configdefinitions/qr-templates.def b/container-core/src/main/resources/configdefinitions/qr-templates.def deleted file mode 100644 index 46b1a5cbd65..00000000000 --- a/container-core/src/main/resources/configdefinitions/qr-templates.def +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -# Not used -# TODO: Remove on Vespa 7 -namespace=container.core - -## Prefix to use in queries to choose a given template -templateset[].urlprefix string - -## The id of the Java class which the given templateset -## should be an instance of. This is only used for implementing -## templates in the Java API instead of Velocity. -templateset[].classid string default="" - -## The symbolic name of the Osgi bundle this template is located in. -## Assumed to be the same as the classid if not set, and is only used -## when classid is used. -templateset[].bundle string default="" - -## The MIME type of a given template -templateset[].mimetype string default="text/html" - -## The character set of a given template -templateset[].encoding string default="iso-8859-1" - -## Not used -templateset[].rankprofile int default=0 - - -## Not used in 1.0 -templateset[].keepalive bool default=false - -## Header template. Always rendered. -templateset[].headertemplate string default="" - -## Footer template. Always rendered. -templateset[].footertemplate string default="" - -## Nohits template. Rendered if there are no hits in the result. -templateset[].nohitstemplate string default="" - -## Hit template. Rendered if there are hits in the result. -templateset[].hittemplate string default="" - -## Error template. Rendered if there is an error condition. This is -## not mutually exclusive with the (no)hit templates as such. -templateset[].errortemplate string default="" - -## Aggregated groups header template. -## Default rendering is used if missing -templateset[].groupsheadertemplate string default="[DEFAULT]" - -## Aggregated range group template. -## Default rendering is used if missing -templateset[].rangegrouptemplate string default="[DEFAULT]" - -## Aggregated exact group template -## Default rendering is used if missing -templateset[].exactgrouptemplate string default="[DEFAULT]" - -## Aggregated groups footer template. -## Default rendering is used if missing -templateset[].groupsfootertemplate string default="[DEFAULT]" - -## Tags used to highlight results, starting a bolded section. -## An empty string means the template should no override what -## was inserted by the search chain. -templateset[].highlightstarttag string default="" -## Tags used to highlight results, ending a bolded section -## An empty string means the template should no override what -## was inserted by the search chain. -templateset[].highlightendtag string default="" -## Tags used to highlight results, separating dynamic snippets -## An empty string means the template should no override what -## was inserted by the search chain. -templateset[].highlightseptag string default="" - -## The summary class to use for this template if there is none -## defined in the query. -templateset[].defaultsummaryclass string default="" diff --git a/container-core/src/main/resources/configdefinitions/qr.def b/container-core/src/main/resources/configdefinitions/qr.def index d6549674137..fe44b04e9d5 100644 --- a/container-core/src/main/resources/configdefinitions/qr.def +++ b/container-core/src/main/resources/configdefinitions/qr.def @@ -2,8 +2,7 @@ namespace=container ### All params must be flagged as 'restart' because this config is manually -### retrieved by ConfiguredApplication.start to init the rpc server in -### com.yahoo.container.Server. +### retrieved by ConfiguredApplication.start to init the rpc server ## filedistributor rpc configuration filedistributor.configid reference default="" restart @@ -20,10 +19,6 @@ rpc.host string default="" restart ## The id this service should register itself with in slobrok rpc.slobrokId string default="" restart -## Whether to obtain coverage reports by default. This can be overridden with -## the 'reportcoverage' HTTP parameter. -coveragereports bool default=false restart - ## A unique identifier string for this QRS. The only guarantee given is ## this string will be unique for every QRS in a Vespa application. discriminator string default="qrserver.0" restart diff --git a/container-core/src/main/resources/configdefinitions/vip-status.def b/container-core/src/main/resources/configdefinitions/vip-status.def index 6aa10ff1b90..ed7ab3e4802 100644 --- a/container-core/src/main/resources/configdefinitions/vip-status.def +++ b/container-core/src/main/resources/configdefinitions/vip-status.def @@ -1,12 +1,6 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=container.core -## If there is a Vespa search backend connected to this container, and that -## backend is out of service, automatically remove this container from VIP -## rotation, ignoring any status file. -## TODO VESPA 7: This is always true and can be removed -noSearchBackendsImpliesOutOfService bool default=true - ## Whether to return hard-coded reply or serve "status.html" from disk accessdisk bool default=false |