summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@broadpark.no>2017-09-15 10:40:19 +0000
committerGitHub <noreply@github.com>2017-09-15 10:40:19 +0000
commitd4f89adb4beaf09c8aecfd5a6ba1e4d459ce119e (patch)
treec6eb941e9e97ad88d4281c24d3f8c0cc23983c18
parent02fc546e8545be4d466c178c838b382657becbcb (diff)
parentdfaf8621703d009d7e6244011fe357563aa191d3 (diff)
Merge pull request #3415 from vespa-engine/geirst/add-hwinfo-config-to-proton.cfg
Add hwinfo config for disk size and memory size.
-rw-r--r--searchcore/src/vespa/searchcore/config/proton.def10
1 files changed, 10 insertions, 0 deletions
diff --git a/searchcore/src/vespa/searchcore/config/proton.def b/searchcore/src/vespa/searchcore/config/proton.def
index ac17efcab3f..428ec0cfcb1 100644
--- a/searchcore/src/vespa/searchcore/config/proton.def
+++ b/searchcore/src/vespa/searchcore/config/proton.def
@@ -403,6 +403,11 @@ writefilter.disklimit double default = 0.8
## Interval between sampling of disk and memory usage. Default is 60 seconds.
writefilter.sampleinterval double default = 60.0
+## The size of the disk partition (in bytes) on which proton basedir is located.
+## If set to 0, the disk size is sampled by looking at the filesystem space info.
+## The disk size is used when determining if feed should be blocked in writefilter.
+hwinfo.disk.size long default = 0
+
## Override for disk write speed, measured in MiB/s. When zero, the
## actual disk write speed is sampled by writing data to a temporary file.
hwinfo.disk.writespeed double default = 200.0
@@ -415,6 +420,11 @@ hwinfo.disk.samplewritesize long default = 1073741824
## Unit is MiB/s, default is 100.0 MiB/s.
hwinfo.disk.slowwritespeedlimit double default = 100.0
+## The size of physical memory (in bytes) available to proton.
+## If set to 0, the memory size is sampled as _SC_PHYS_PAGES * _SC_PAGESIZE by using sysconf to do the lookup.
+## The memory size is used when determining if feed should be blocked in writefilter.
+hwinfo.memory.size long default = 0
+
## Adjustment to resource limit when determining if maintenance jobs can run.
##
## Currently used by 'lid_space_compaction' and 'move_buckets' jobs.