From 07563379dcce59fca243131f58a54f0c0e5df28f Mon Sep 17 00:00:00 2001 From: mikemccand Date: Mon, 5 May 2014 16:17:57 -0400 Subject: [PATCH] fix docs for merging and throttling --- docs/reference/index-modules/merge.asciidoc | 5 +++-- docs/reference/modules/indices.asciidoc | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/reference/index-modules/merge.asciidoc b/docs/reference/index-modules/merge.asciidoc index bd388fe2695..d0ec9549173 100644 --- a/docs/reference/index-modules/merge.asciidoc +++ b/docs/reference/index-modules/merge.asciidoc @@ -201,8 +201,9 @@ The scheduler supports the following settings: `index.merge.scheduler.max_thread_count`:: -The maximum number of threads to perform the merge operation. Defaults to -`Math.max(1, Math.min(3, Runtime.getRuntime().availableProcessors() / 2))`. +The maximum number of concurrent merge threads that may run at once. Defaults +to `1` which works best with spinning-magnets disks. If you are using +a good solid-state disk (SSD) instead then try setting this to `3`. [float] ==== SerialMergeScheduler diff --git a/docs/reference/modules/indices.asciidoc b/docs/reference/modules/indices.asciidoc index 85bf6787daa..9d22f5f782e 100644 --- a/docs/reference/modules/indices.asciidoc +++ b/docs/reference/modules/indices.asciidoc @@ -69,7 +69,7 @@ The following settings can be set to control the store throttling: [horizontal] `indices.store.throttle.type`:: - could be `merge` (default), `not` or `all`. See <>. + could be `merge` (default), `none` or `all`. See <>. `indices.store.throttle.max_bytes_per_sec`:: defaults to `50mb`.