diff options
author | Håkon Hallingstad <hakon@verizonmedia.com> | 2020-04-20 10:36:33 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-20 10:36:33 +0200 |
commit | b105eead1fbbcefbb85bc962749f2a12fa660bbe (patch) | |
tree | 7a3c996c00b854066d32608a002335715fb98c96 /configdefinitions | |
parent | f61f6c701dc91e839b865f158a6da56ff166def7 (diff) | |
parent | 9ab0ef70e9ed4f422df67603f26bcb0c7918fdc4 (diff) |
Merge branch 'master' into hakonhall/remove-use-bucket-space-metric-feature-flag
Diffstat (limited to 'configdefinitions')
-rw-r--r-- | configdefinitions/src/vespa/attributes.def | 6 | ||||
-rw-r--r-- | configdefinitions/src/vespa/dispatch.def | 12 | ||||
-rw-r--r-- | configdefinitions/src/vespa/lb-services.def | 4 | ||||
-rw-r--r-- | configdefinitions/src/vespa/stor-filestor.def | 2 |
4 files changed, 22 insertions, 2 deletions
diff --git a/configdefinitions/src/vespa/attributes.def b/configdefinitions/src/vespa/attributes.def index f9db9eb2f0d..604ddd40930 100644 --- a/configdefinitions/src/vespa/attributes.def +++ b/configdefinitions/src/vespa/attributes.def @@ -30,3 +30,9 @@ attribute[].densepostinglistthreshold double default=0.40 attribute[].tensortype string default="" # Whether this is an imported attribute (from parent document db) or not. attribute[].imported bool default=false + +# Configuration parameters for a hnsw index used together with a 1-dimensional indexed tensor for approximate nearest neighbor search. +attribute[].index.hnsw.enabled bool default=false +attribute[].index.hnsw.maxlinkspernode int default=16 +attribute[].index.hnsw.distancemetric enum { EUCLIDEAN, ANGULAR, GEODEGREES } default=EUCLIDEAN +attribute[].index.hnsw.neighborstoexploreatinsert int default=200 diff --git a/configdefinitions/src/vespa/dispatch.def b/configdefinitions/src/vespa/dispatch.def index 77f6dffd714..0776e648ad7 100644 --- a/configdefinitions/src/vespa/dispatch.def +++ b/configdefinitions/src/vespa/dispatch.def @@ -23,6 +23,15 @@ distributionPolicy enum { ROUNDROBIN, ADAPTIVE } default=ROUNDROBIN ## don't use it if you don't (really) mean it. maxHitsPerNode int default=2147483647 +## Probability for getting the K best hits (topK). +## A value of 1.0 will ask all N partitions for K hits. +## Any value between <0, 1> will use a Student T with 30 degrees freedom and compute a value Q that +## will give you the globally K best hits according to this formula with the desired probability. +## q = k/n + qT (p',30) x √(k × (1/n) × (1 − 1/n)) +## With a probability of 0.999 and K=200 and N=10 will give a Q of 38, meaning that you only need to fetch 19% compared to +## default setting of 1.0. This is a significant optimisation with with very little loss in presicion. +topKProbability double default=1.0 + # Is multi-level dispatch configured for this cluster # Deprecated, will go away soon, NOOP useMultilevelDispatch bool default=false @@ -48,6 +57,9 @@ numJrtTransportThreads int default=8 # Number of JRT connections per backend node numJrtConnectionsPerNode int default=8 +# Number of seconds to spend warming up code to prevent JIT cold start issues. +warmuptime double default=0.1 + # The unique key of a search node node[].key int diff --git a/configdefinitions/src/vespa/lb-services.def b/configdefinitions/src/vespa/lb-services.def index 8d5e7015947..cc496a99c20 100644 --- a/configdefinitions/src/vespa/lb-services.def +++ b/configdefinitions/src/vespa/lb-services.def @@ -4,10 +4,12 @@ namespace=cloud.config +# Enable proxy-protocol for nginx upstreams +nginxUpstreamProxyProtocol bool default=false + # Active rotation given as flag 'active' for a prod region in deployment.xml # Default true for now (since code in config-model to set it is not ready yet), should have no default value tenants{}.applications{}.activeRotation bool default=true -tenants{}.applications{}.use4443Upstream bool default=false tenants{}.applications{}.hosts{}.hostname string default="(unknownhostname)" tenants{}.applications{}.hosts{}.services{}.type string default="(noservicetype)" diff --git a/configdefinitions/src/vespa/stor-filestor.def b/configdefinitions/src/vespa/stor-filestor.def index c02a9018064..7816ee74fde 100644 --- a/configdefinitions/src/vespa/stor-filestor.def +++ b/configdefinitions/src/vespa/stor-filestor.def @@ -24,7 +24,7 @@ disk_operation_timeout int default=0 restart ## PERFORMANCE PARAMETERS ## Number of threads to use for each mountpoint. -num_threads int default=6 restart +num_threads int default=8 restart ## When merging, if we find more than this number of documents that exist on all ## of the same copies, send a separate apply bucket diff with these entries |