From 7aeea764ba16ff77f75511768c19eedf9a52a590 Mon Sep 17 00:00:00 2001 From: Nik Everett Date: Fri, 15 Jul 2016 16:02:07 -0400 Subject: [PATCH] Remove wait_for_status=yellow from the docs It is no longer required after 687e2e12b31ed3c12ef4c411333bff9da58fc808. --- .../gradle/doc/RestTestsFromSnippetsTask.groovy | 7 ------- docs/plugins/analysis-icu.asciidoc | 6 ------ docs/plugins/analysis-kuromoji.asciidoc | 14 -------------- docs/plugins/analysis-phonetic.asciidoc | 2 -- .../analysis/analyzers/configuring.asciidoc | 3 --- .../analysis/analyzers/custom-analyzer.asciidoc | 5 ----- .../analyzers/fingerprint-analyzer.asciidoc | 2 -- .../analysis/analyzers/pattern-analyzer.asciidoc | 4 ---- .../analysis/analyzers/standard-analyzer.asciidoc | 3 --- .../analysis/analyzers/stop-analyzer.asciidoc | 4 ---- .../charfilters/htmlstrip-charfilter.asciidoc | 5 ----- .../charfilters/mapping-charfilter.asciidoc | 4 ---- .../pattern-replace-charfilter.asciidoc | 4 ---- docs/reference/analysis/testing.asciidoc | 2 -- .../analysis/tokenizers/classic-tokenizer.asciidoc | 5 ----- .../tokenizers/edgengram-tokenizer.asciidoc | 4 ---- .../analysis/tokenizers/ngram-tokenizer.asciidoc | 4 ---- .../tokenizers/pathhierarchy-tokenizer.asciidoc | 3 --- .../analysis/tokenizers/pattern-tokenizer.asciidoc | 4 ---- .../tokenizers/standard-tokenizer.asciidoc | 5 ----- .../tokenizers/uaxurlemail-tokenizer.asciidoc | 2 -- docs/reference/docs/delete-by-query.asciidoc | 2 +- docs/reference/docs/reindex.asciidoc | 10 +++++----- docs/reference/docs/update-by-query.asciidoc | 2 +- docs/reference/mapping/params/analyzer.asciidoc | 2 -- .../migration/migrate_5_0/mapping.asciidoc | 2 +- docs/reference/search/request/sort.asciidoc | 6 ++---- 27 files changed, 10 insertions(+), 106 deletions(-) diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/doc/RestTestsFromSnippetsTask.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/doc/RestTestsFromSnippetsTask.groovy index c7f4316ee04..adea61cd4f3 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/doc/RestTestsFromSnippetsTask.groovy +++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/doc/RestTestsFromSnippetsTask.groovy @@ -184,13 +184,6 @@ public class RestTestsFromSnippetsTask extends SnippetsTask { current.println('---') current.println("setup:") body(setup, true) - // always wait for yellow before anything is executed - current.println( - " - do:\n" + - " raw:\n" + - " method: GET\n" + - " path: \"_cluster/health\"\n" + - " wait_for_status: \"yellow\"") } private void body(Snippet snippet, boolean inSetup) { diff --git a/docs/plugins/analysis-icu.asciidoc b/docs/plugins/analysis-icu.asciidoc index 3dbe7b2e354..a21e0c5c82f 100644 --- a/docs/plugins/analysis-icu.asciidoc +++ b/docs/plugins/analysis-icu.asciidoc @@ -161,8 +161,6 @@ PUT icu_sample } } -GET _cluster/health?wait_for_status=yellow - POST icu_sample/_analyze?analyzer=my_analyzer&text=Elasticsearch. Wow! -------------------------------------------------- // CONSOLE @@ -360,8 +358,6 @@ PUT /my_index } } -GET _cluster/health?wait_for_status=yellow - GET _search <3> { "query": { @@ -481,8 +477,6 @@ PUT icu_sample } } -GET _cluster/health?wait_for_status=yellow - GET icu_sample/_analyze?analyzer=latin { "text": "你好" <2> diff --git a/docs/plugins/analysis-kuromoji.asciidoc b/docs/plugins/analysis-kuromoji.asciidoc index b0d6c1eb962..d7b357cb455 100644 --- a/docs/plugins/analysis-kuromoji.asciidoc +++ b/docs/plugins/analysis-kuromoji.asciidoc @@ -172,8 +172,6 @@ PUT kuromoji_sample } } -GET _cluster/health?wait_for_status=yellow - POST kuromoji_sample/_analyze?analyzer=my_analyzer&text=東京スカイツリー -------------------------------------------------- // CONSOLE @@ -226,8 +224,6 @@ PUT kuromoji_sample } } -GET _cluster/health?wait_for_status=yellow - POST kuromoji_sample/_analyze?analyzer=my_analyzer&text=飲み -------------------------------------------------- // CONSOLE @@ -286,8 +282,6 @@ PUT kuromoji_sample } } -GET _cluster/health?wait_for_status=yellow - POST kuromoji_sample/_analyze?analyzer=my_analyzer&text=寿司がおいしいね -------------------------------------------------- @@ -360,8 +354,6 @@ PUT kuromoji_sample } } -GET _cluster/health?wait_for_status=yellow - POST kuromoji_sample/_analyze?analyzer=katakana_analyzer&text=寿司 <1> POST kuromoji_sample/_analyze?analyzer=romaji_analyzer&text=寿司 <2> @@ -413,8 +405,6 @@ PUT kuromoji_sample } } -GET _cluster/health?wait_for_status=yellow - POST kuromoji_sample/_analyze?analyzer=my_analyzer&text=コピー <1> POST kuromoji_sample/_analyze?analyzer=my_analyzer&text=サーバー <2> @@ -464,8 +454,6 @@ PUT kuromoji_sample } } -GET _cluster/health?wait_for_status=yellow - POST kuromoji_sample/_analyze?analyzer=analyzer_with_ja_stop&text=ストップは消える -------------------------------------------------- // CONSOLE @@ -512,8 +500,6 @@ PUT kuromoji_sample } } -GET _cluster/health?wait_for_status=yellow - POST kuromoji_sample/_analyze?analyzer=my_analyzer&text=一〇〇〇 -------------------------------------------------- diff --git a/docs/plugins/analysis-phonetic.asciidoc b/docs/plugins/analysis-phonetic.asciidoc index b44218b7521..34f14abe3c5 100644 --- a/docs/plugins/analysis-phonetic.asciidoc +++ b/docs/plugins/analysis-phonetic.asciidoc @@ -79,8 +79,6 @@ PUT phonetic_sample } } -GET _cluster/health?wait_for_status=yellow - POST phonetic_sample/_analyze?analyzer=my_analyzer&text=Joe Bloggs <1> -------------------------------------------------- // CONSOLE diff --git a/docs/reference/analysis/analyzers/configuring.asciidoc b/docs/reference/analysis/analyzers/configuring.asciidoc index 2ce13702e00..d4c606df24d 100644 --- a/docs/reference/analysis/analyzers/configuring.asciidoc +++ b/docs/reference/analysis/analyzers/configuring.asciidoc @@ -38,8 +38,6 @@ PUT my_index } } -GET _cluster/health?wait_for_status=yellow - POST my_index/_analyze { "field": "my_text", <2> @@ -98,4 +96,3 @@ POST my_index/_analyze // TESTRESPONSE ///////////////////// - diff --git a/docs/reference/analysis/analyzers/custom-analyzer.asciidoc b/docs/reference/analysis/analyzers/custom-analyzer.asciidoc index 1707a9a399b..f14759856dd 100644 --- a/docs/reference/analysis/analyzers/custom-analyzer.asciidoc +++ b/docs/reference/analysis/analyzers/custom-analyzer.asciidoc @@ -74,8 +74,6 @@ PUT my_index } } -GET _cluster/health?wait_for_status=yellow - POST my_index/_analyze { "analyzer": "my_custom_analyzer", @@ -196,8 +194,6 @@ PUT my_index } } -GET _cluster/health?wait_for_status=yellow - POST my_index/_analyze { "analyzer": "my_custom_analyzer", @@ -258,4 +254,3 @@ The above example produces the following terms: --------------------------- [ i'm, _happy_, person, you ] --------------------------- - diff --git a/docs/reference/analysis/analyzers/fingerprint-analyzer.asciidoc b/docs/reference/analysis/analyzers/fingerprint-analyzer.asciidoc index 24dc92380bb..c917cc7aa03 100644 --- a/docs/reference/analysis/analyzers/fingerprint-analyzer.asciidoc +++ b/docs/reference/analysis/analyzers/fingerprint-analyzer.asciidoc @@ -114,8 +114,6 @@ PUT my_index } } -GET _cluster/health?wait_for_status=yellow - POST my_index/_analyze { "analyzer": "my_fingerprint_analyzer", diff --git a/docs/reference/analysis/analyzers/pattern-analyzer.asciidoc b/docs/reference/analysis/analyzers/pattern-analyzer.asciidoc index bd6000c3de7..448f5289d54 100644 --- a/docs/reference/analysis/analyzers/pattern-analyzer.asciidoc +++ b/docs/reference/analysis/analyzers/pattern-analyzer.asciidoc @@ -195,8 +195,6 @@ PUT my_index } } -GET _cluster/health?wait_for_status=yellow - POST my_index/_analyze { "analyzer": "my_email_analyzer", @@ -285,8 +283,6 @@ PUT my_index } } -GET _cluster/health?wait_for_status=yellow - GET my_index/_analyze { "analyzer": "camel", diff --git a/docs/reference/analysis/analyzers/standard-analyzer.asciidoc b/docs/reference/analysis/analyzers/standard-analyzer.asciidoc index 3b948892483..bc49be50792 100644 --- a/docs/reference/analysis/analyzers/standard-analyzer.asciidoc +++ b/docs/reference/analysis/analyzers/standard-analyzer.asciidoc @@ -179,8 +179,6 @@ PUT my_index } } -GET _cluster/health?wait_for_status=yellow - POST my_index/_analyze { "analyzer": "my_english_analyzer", @@ -278,4 +276,3 @@ The above example produces the following terms: --------------------------- [ 2, quick, brown, foxes, jumpe, d, over, lazy, dog's, bone ] --------------------------- - diff --git a/docs/reference/analysis/analyzers/stop-analyzer.asciidoc b/docs/reference/analysis/analyzers/stop-analyzer.asciidoc index e40436342d7..31cb07ce706 100644 --- a/docs/reference/analysis/analyzers/stop-analyzer.asciidoc +++ b/docs/reference/analysis/analyzers/stop-analyzer.asciidoc @@ -154,8 +154,6 @@ PUT my_index } } -GET _cluster/health?wait_for_status=yellow - POST my_index/_analyze { "analyzer": "my_stop_analyzer", @@ -240,5 +238,3 @@ The above example produces the following terms: --------------------------- [ quick, brown, foxes, jumped, lazy, dog, s, bone ] --------------------------- - - diff --git a/docs/reference/analysis/charfilters/htmlstrip-charfilter.asciidoc b/docs/reference/analysis/charfilters/htmlstrip-charfilter.asciidoc index 3d8b187d772..217b618c9c2 100644 --- a/docs/reference/analysis/charfilters/htmlstrip-charfilter.asciidoc +++ b/docs/reference/analysis/charfilters/htmlstrip-charfilter.asciidoc @@ -93,8 +93,6 @@ PUT my_index } } -GET _cluster/health?wait_for_status=yellow - POST my_index/_analyze { "analyzer": "my_analyzer", @@ -130,6 +128,3 @@ The above example produces the following term: --------------------------- [ \nI'm so happy!\n ] --------------------------- - - - diff --git a/docs/reference/analysis/charfilters/mapping-charfilter.asciidoc b/docs/reference/analysis/charfilters/mapping-charfilter.asciidoc index ed90e9f6ab6..30e565d443a 100644 --- a/docs/reference/analysis/charfilters/mapping-charfilter.asciidoc +++ b/docs/reference/analysis/charfilters/mapping-charfilter.asciidoc @@ -66,8 +66,6 @@ PUT my_index } } -GET _cluster/health?wait_for_status=yellow - POST my_index/_analyze { "analyzer": "my_analyzer", @@ -134,8 +132,6 @@ PUT my_index } } -GET _cluster/health?wait_for_status=yellow - POST my_index/_analyze { "analyzer": "my_analyzer", diff --git a/docs/reference/analysis/charfilters/pattern-replace-charfilter.asciidoc b/docs/reference/analysis/charfilters/pattern-replace-charfilter.asciidoc index 9299eb800b5..3f4bf9aa05a 100644 --- a/docs/reference/analysis/charfilters/pattern-replace-charfilter.asciidoc +++ b/docs/reference/analysis/charfilters/pattern-replace-charfilter.asciidoc @@ -58,8 +58,6 @@ PUT my_index } } -GET _cluster/health?wait_for_status=yellow - POST my_index/_analyze { "analyzer": "my_analyzer", @@ -123,8 +121,6 @@ PUT my_index } } -GET _cluster/health?wait_for_status=yellow - POST my_index/_analyze { "analyzer": "my_analyzer", diff --git a/docs/reference/analysis/testing.asciidoc b/docs/reference/analysis/testing.asciidoc index ab50f6564bb..0a603973e18 100644 --- a/docs/reference/analysis/testing.asciidoc +++ b/docs/reference/analysis/testing.asciidoc @@ -69,8 +69,6 @@ PUT my_index } } -GET _cluster/health?wait_for_status=yellow - GET my_index/_analyze <3> { "analyzer": "std_folded", <4> diff --git a/docs/reference/analysis/tokenizers/classic-tokenizer.asciidoc b/docs/reference/analysis/tokenizers/classic-tokenizer.asciidoc index 45d4ad41526..52bdcbd7732 100644 --- a/docs/reference/analysis/tokenizers/classic-tokenizer.asciidoc +++ b/docs/reference/analysis/tokenizers/classic-tokenizer.asciidoc @@ -164,8 +164,6 @@ PUT my_index } } -GET _cluster/health?wait_for_status=yellow - POST my_index/_analyze { "analyzer": "my_analyzer", @@ -264,6 +262,3 @@ The above example produces the following terms: --------------------------- [ The, 2, QUICK, Brown, Foxes, jumpe, d, over, the, lazy, dog's, bone ] --------------------------- - - - diff --git a/docs/reference/analysis/tokenizers/edgengram-tokenizer.asciidoc b/docs/reference/analysis/tokenizers/edgengram-tokenizer.asciidoc index 0728767896a..3ef526325e7 100644 --- a/docs/reference/analysis/tokenizers/edgengram-tokenizer.asciidoc +++ b/docs/reference/analysis/tokenizers/edgengram-tokenizer.asciidoc @@ -128,8 +128,6 @@ PUT my_index } } -GET _cluster/health?wait_for_status=yellow - POST my_index/_analyze { "analyzer": "my_analyzer", @@ -319,5 +317,3 @@ GET my_index/_search ---------------------------- // TESTRESPONSE[s/"took".*/"took": "$body.took",/] ///////////////////// - - diff --git a/docs/reference/analysis/tokenizers/ngram-tokenizer.asciidoc b/docs/reference/analysis/tokenizers/ngram-tokenizer.asciidoc index cf45da0627e..ae3183f0fd1 100644 --- a/docs/reference/analysis/tokenizers/ngram-tokenizer.asciidoc +++ b/docs/reference/analysis/tokenizers/ngram-tokenizer.asciidoc @@ -230,8 +230,6 @@ PUT my_index } } -GET _cluster/health?wait_for_status=yellow - POST my_index/_analyze { "analyzer": "my_analyzer", @@ -302,5 +300,3 @@ The above example produces the following terms: --------------------------- [ Qui, uic, ick, Fox, oxe, xes ] --------------------------- - - diff --git a/docs/reference/analysis/tokenizers/pathhierarchy-tokenizer.asciidoc b/docs/reference/analysis/tokenizers/pathhierarchy-tokenizer.asciidoc index b656e67eaec..55aa7d66da3 100644 --- a/docs/reference/analysis/tokenizers/pathhierarchy-tokenizer.asciidoc +++ b/docs/reference/analysis/tokenizers/pathhierarchy-tokenizer.asciidoc @@ -114,8 +114,6 @@ PUT my_index } } -GET _cluster/health?wait_for_status=yellow - POST my_index/_analyze { "analyzer": "my_analyzer", @@ -172,4 +170,3 @@ If we were to set `reverse` to `true`, it would produce the following: --------------------------- [ one/two/three/, two/three/, three/ ] --------------------------- - diff --git a/docs/reference/analysis/tokenizers/pattern-tokenizer.asciidoc b/docs/reference/analysis/tokenizers/pattern-tokenizer.asciidoc index ca902a4e5f2..c96fd08c952 100644 --- a/docs/reference/analysis/tokenizers/pattern-tokenizer.asciidoc +++ b/docs/reference/analysis/tokenizers/pattern-tokenizer.asciidoc @@ -130,8 +130,6 @@ PUT my_index } } -GET _cluster/health?wait_for_status=yellow - POST my_index/_analyze { "analyzer": "my_analyzer", @@ -223,8 +221,6 @@ PUT my_index } } -GET _cluster/health?wait_for_status=yellow - POST my_index/_analyze { "analyzer": "my_analyzer", diff --git a/docs/reference/analysis/tokenizers/standard-tokenizer.asciidoc b/docs/reference/analysis/tokenizers/standard-tokenizer.asciidoc index ee052529b43..9f77a0e13dc 100644 --- a/docs/reference/analysis/tokenizers/standard-tokenizer.asciidoc +++ b/docs/reference/analysis/tokenizers/standard-tokenizer.asciidoc @@ -155,8 +155,6 @@ PUT my_index } } -GET _cluster/health?wait_for_status=yellow - POST my_index/_analyze { "analyzer": "my_analyzer", @@ -269,6 +267,3 @@ The above example produces the following terms: --------------------------- [ The, 2, QUICK, Brown, Foxes, jumpe, d, over, the, lazy, dog's, bone ] --------------------------- - - - diff --git a/docs/reference/analysis/tokenizers/uaxurlemail-tokenizer.asciidoc b/docs/reference/analysis/tokenizers/uaxurlemail-tokenizer.asciidoc index 500a5e191f1..7fea0f1e8d8 100644 --- a/docs/reference/analysis/tokenizers/uaxurlemail-tokenizer.asciidoc +++ b/docs/reference/analysis/tokenizers/uaxurlemail-tokenizer.asciidoc @@ -111,8 +111,6 @@ PUT my_index } } -GET _cluster/health?wait_for_status=yellow - POST my_index/_analyze { "analyzer": "my_analyzer", diff --git a/docs/reference/docs/delete-by-query.asciidoc b/docs/reference/docs/delete-by-query.asciidoc index b7f31ce4789..128f5621902 100644 --- a/docs/reference/docs/delete-by-query.asciidoc +++ b/docs/reference/docs/delete-by-query.asciidoc @@ -101,7 +101,7 @@ POST twitter,blog/tweet,post/_delete_by_query } -------------------------------------------------- // CONSOLE -// TEST[s/^/PUT twitter\nPUT blog\nGET _cluster\/health?wait_for_status=yellow\n/] +// TEST[s/^/PUT twitter\nPUT blog\n/] If you provide `routing` then the routing is copied to the scroll query, limiting the process to the shards that match that routing value: diff --git a/docs/reference/docs/reindex.asciidoc b/docs/reference/docs/reindex.asciidoc index 2afc8e86bb1..5bf3c52339c 100644 --- a/docs/reference/docs/reindex.asciidoc +++ b/docs/reference/docs/reindex.asciidoc @@ -178,7 +178,7 @@ POST _reindex } -------------------------------------------------- // CONSOLE -// TEST[s/^/PUT twitter\nPUT blog\nGET _cluster\/health?wait_for_status=yellow\n/] +// TEST[s/^/PUT twitter\nPUT blog\n/] It's also possible to limit the number of processed documents by setting `size`. This will only copy a single document from `twitter` to @@ -320,7 +320,7 @@ POST _reindex } -------------------------------------------------- // CONSOLE -// TEST[s/^/PUT source\nGET _cluster\/health?wait_for_status=yellow\n/] +// TEST[s/^/PUT source\n/] By default `_reindex` uses scroll batches of 1000. You can change the batch size with the `size` field in the `source` element: @@ -340,7 +340,7 @@ POST _reindex } -------------------------------------------------- // CONSOLE -// TEST[s/^/PUT source\nGET _cluster\/health?wait_for_status=yellow\n/] +// TEST[s/^/PUT source\n/] Reindex can also use the <> feature by specifying a `pipeline` like this: @@ -359,7 +359,7 @@ POST _reindex } -------------------------------------------------- // CONSOLE -// TEST[s/^/PUT source\nGET _cluster\/health?wait_for_status=yellow\n/] +// TEST[s/^/PUT source\n/] [float] === Reindex from Remote @@ -390,7 +390,7 @@ POST _reindex -------------------------------------------------- // CONSOLE // TEST[setup:host] -// TEST[s/^/PUT source\nGET _cluster\/health?wait_for_status=yellow\n/] +// TEST[s/^/PUT source\n/] // TEST[s/otherhost:9200",/\${host}"/] // TEST[s/"username": "user",//] // TEST[s/"password": "pass"//] diff --git a/docs/reference/docs/update-by-query.asciidoc b/docs/reference/docs/update-by-query.asciidoc index 06c20bcf07e..0fb57aa5cc7 100644 --- a/docs/reference/docs/update-by-query.asciidoc +++ b/docs/reference/docs/update-by-query.asciidoc @@ -156,7 +156,7 @@ types at once, just like the search API: POST twitter,blog/tweet,post/_update_by_query -------------------------------------------------- // CONSOLE -// TEST[s/^/PUT twitter\nPUT blog\nGET _cluster\/health?wait_for_status=yellow\n/] +// TEST[s/^/PUT twitter\nPUT blog\n/] If you provide `routing` then the routing is copied to the scroll query, limiting the process to the shards that match that routing value: diff --git a/docs/reference/mapping/params/analyzer.asciidoc b/docs/reference/mapping/params/analyzer.asciidoc index 7fc6c801e16..c075b662805 100644 --- a/docs/reference/mapping/params/analyzer.asciidoc +++ b/docs/reference/mapping/params/analyzer.asciidoc @@ -60,8 +60,6 @@ PUT /my_index } } -GET _cluster/health?wait_for_status=yellow - GET my_index/_analyze?field=text <3> { "text": "The quick Brown Foxes." diff --git a/docs/reference/migration/migrate_5_0/mapping.asciidoc b/docs/reference/migration/migrate_5_0/mapping.asciidoc index fa5411cf426..dd467abe9e1 100644 --- a/docs/reference/migration/migrate_5_0/mapping.asciidoc +++ b/docs/reference/migration/migrate_5_0/mapping.asciidoc @@ -224,7 +224,7 @@ POST _reindex } --------------- // CONSOLE -// TEST[s/^/PUT oldindex\nGET _cluster\/health?wait_for_status=yellow\n/] +// TEST[s/^/PUT oldindex\n/] You can replace `_ttl` with time based index names (preferred) or by adding a cron job which runs a delete-by-query on a timestamp field in the source diff --git a/docs/reference/search/request/sort.asciidoc b/docs/reference/search/request/sort.asciidoc index d0a50f0ebfd..85c5d1e675f 100644 --- a/docs/reference/search/request/sort.asciidoc +++ b/docs/reference/search/request/sort.asciidoc @@ -15,7 +15,7 @@ PUT /my_index "my_type": { "properties": { "post_date": { "type": "date" }, - "user": { + "user": { "type": "keyword" }, "name": { @@ -26,8 +26,6 @@ PUT /my_index } } } - -GET /_cluster/health?wait_for_status=yellow -------------------------------------------------- // CONSOLE @@ -100,7 +98,7 @@ PUT /my_index/my_type/1?refresh "price": [20, 4] } -POST /_search +POST /_search { "query" : { "term" : { "product" : "chocolate" }