honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Default wait_for_completion to true

This commit is contained in:
Nik Everett 2016-01-28 12:34:38 -05:00
parent da42838cff
commit 6a2acd348a
12 changed files with 4 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/reindex/src/main/java/org/elasticsearch/plugin/reindex/AbstractBaseReindexRestHandler.java
View File

@ -53,7 +53,7 @@ public abstract class AbstractBaseReindexRestHandler<Request extends ActionReque
} }
protected void execute(RestRequest request, Request internalRequest, RestChannel channel) throws IOException { protected void execute(RestRequest request, Request internalRequest, RestChannel channel) throws IOException {
if (request.paramAsBoolean("wait_for_completion", false)) { if (request.paramAsBoolean("wait_for_completion", true)) {
action.execute(internalRequest, new BulkIndexByScrollResponseContentListener<Response>(channel)); action.execute(internalRequest, new BulkIndexByScrollResponseContentListener<Response>(channel));
return; return;
} }

13
plugins/reindex/src/test/resources/rest-api-spec/test/reindex/10_basic.yaml
View File

@ -11,7 +11,6 @@
- do: - do:
reindex: reindex:
wait_for_completion: true
body: body:
source: source:
index: source index: source
@ -43,7 +42,6 @@
- do: - do:
reindex: reindex:
wait_for_completion: true
body: body:
source: source:
index: source index: source
@ -57,7 +55,7 @@
- is_true: took - is_true: took
--- ---
"wait_for_completion=true": "wait_for_completion=false":
- do: - do:
index: index:
index: source index: source
@ -69,6 +67,7 @@
- do: - do:
reindex: reindex:
wait_for_completion: false
body: body:
source: source:
index: source index: source
@ -104,7 +103,6 @@
- do: - do:
catch: conflict catch: conflict
reindex: reindex:
wait_for_completion: true
body: body:
source: source:
index: source index: source
@ -144,7 +142,6 @@
- do: - do:
reindex: reindex:
wait_for_completion: true
body: body:
conflicts: proceed conflicts: proceed
source: source:
@ -172,7 +169,6 @@
- do: - do:
reindex: reindex:
wait_for_completion: true
refresh: true refresh: true
body: body:
source: source:
@ -205,7 +201,6 @@
- do: - do:
reindex: reindex:
refresh: true refresh: true
wait_for_completion: true
body: body:
source: source:
index: twitter index: twitter
@ -238,7 +233,6 @@
- do: - do:
reindex: reindex:
refresh: true refresh: true
wait_for_completion: true
body: body:
source: source:
index: twitter index: twitter
@ -273,7 +267,6 @@
- do: - do:
reindex: reindex:
refresh: true refresh: true
wait_for_completion: true
body: body:
source: source:
index: twitter index: twitter
@ -308,7 +301,6 @@
- do: - do:
reindex: reindex:
refresh: true refresh: true
wait_for_completion: true
body: body:
source: source:
index: [twitter, blog] index: [twitter, blog]
@ -356,7 +348,6 @@
- do: - do:
reindex: reindex:
refresh: true refresh: true
wait_for_completion: true
body: body:
size: 1 size: 1
source: source:

2
plugins/reindex/src/test/resources/rest-api-spec/test/reindex/30_search.yaml
View File

@ -18,7 +18,6 @@
- do: - do:
reindex: reindex:
refresh: true refresh: true
wait_for_completion: true
body: body:
source: source:
index: test index: test
@ -53,7 +52,6 @@
- do: - do:
reindex: reindex:
refresh: true refresh: true
wait_for_completion: true
body: body:
size: 1 size: 1
source: source:

4
plugins/reindex/src/test/resources/rest-api-spec/test/reindex/40_versioning.yaml
View File

@ -30,7 +30,6 @@
- do: - do:
reindex: reindex:
refresh: true refresh: true
wait_for_completion: true
body: body:
source: source:
index: src index: src
@ -76,7 +75,6 @@
- do: - do:
reindex: reindex:
refresh: true refresh: true
wait_for_completion: true
body: body:
conflicts: proceed conflicts: proceed
source: source:
@ -124,7 +122,6 @@
- do: - do:
reindex: reindex:
refresh: true refresh: true
wait_for_completion: true
body: body:
source: source:
index: src index: src
@ -169,7 +166,6 @@
- do: - do:
reindex: reindex:
refresh: true refresh: true
wait_for_completion: true
body: body:
source: source:
index: src index: src

2
plugins/reindex/src/test/resources/rest-api-spec/test/reindex/50_routing.yaml
View File

@ -12,7 +12,6 @@
- do: - do:
reindex: reindex:
refresh: true refresh: true
wait_for_completion: true
body: body:
source: source:
index: src index: src
@ -43,7 +42,6 @@
- do: - do:
reindex: reindex:
refresh: true refresh: true
wait_for_completion: true
body: body:
source: source:
index: src index: src

2
plugins/reindex/src/test/resources/rest-api-spec/test/reindex/60_consistency.yaml
View File

@ -23,7 +23,6 @@
catch: unavailable catch: unavailable
reindex: reindex:
timeout: 1s timeout: 1s
wait_for_completion: true
body: body:
source: source:
index: src index: src
@ -35,7 +34,6 @@
- do: - do:
reindex: reindex:
consistency: one consistency: one
wait_for_completion: true
body: body:
source: source:
index: src index: src

7
plugins/reindex/src/test/resources/rest-api-spec/test/update-by-query/10_basic.yaml
View File

@ -12,7 +12,6 @@
- do: - do:
update-by-query: update-by-query:
index: test index: test
wait_for_completion: true
- match: {updated: 1} - match: {updated: 1}
- match: {version_conflicts: 0} - match: {version_conflicts: 0}
- match: {batches: 1} - match: {batches: 1}
@ -34,6 +33,7 @@
- do: - do:
update-by-query: update-by-query:
wait_for_completion: false
index: test index: test
- is_true: task.node - is_true: task.node
- is_true: task.id - is_true: task.id
@ -72,7 +72,6 @@
catch: conflict catch: conflict
update-by-query: update-by-query:
index: test index: test
wait_for_completion: true
- match: {updated: 0} - match: {updated: 0}
- match: {version_conflicts: 1} - match: {version_conflicts: 1}
- match: {batches: 1} - match: {batches: 1}
@ -113,7 +112,6 @@
update-by-query: update-by-query:
index: test index: test
conflicts: proceed conflicts: proceed
wait_for_completion: true
- match: {updated: 0} - match: {updated: 0}
- match: {version_conflicts: 1} - match: {version_conflicts: 1}
- match: {batches: 1} - match: {batches: 1}
@ -141,7 +139,6 @@
- do: - do:
update-by-query: update-by-query:
index: twitter index: twitter
wait_for_completion: true
body: body:
query: query:
match: match:
@ -172,7 +169,6 @@
- do: - do:
update-by-query: update-by-query:
index: twitter index: twitter
wait_for_completion: true
size: 1 size: 1
- match: {updated: 1} - match: {updated: 1}
- match: {version_conflicts: 0} - match: {version_conflicts: 0}
@ -213,5 +209,4 @@
update-by-query: update-by-query:
index: test index: test
scroll_size: 1 scroll_size: 1
wait_for_completion: true
- match: {batches: 3} - match: {batches: 3}

1
plugins/reindex/src/test/resources/rest-api-spec/test/update-by-query/30_new_fields.yaml
View File

@ -45,7 +45,6 @@
- do: - do:
update-by-query: update-by-query:
index: test index: test
wait_for_completion: true
- do: - do:
indices.refresh: {} indices.refresh: {}

1
plugins/reindex/src/test/resources/rest-api-spec/test/update-by-query/40_versioning.yaml
View File

@ -12,7 +12,6 @@
- do: - do:
update-by-query: update-by-query:
index: test index: test
wait_for_completion: true
- match: {updated: 1} - match: {updated: 1}
- match: {version_conflicts: 0} - match: {version_conflicts: 0}

2
plugins/reindex/src/test/resources/rest-api-spec/test/update-by-query/50_consistency.yaml
View File

@ -24,7 +24,6 @@
update-by-query: update-by-query:
index: test index: test
timeout: 1s timeout: 1s
wait_for_completion: true
- match: - match:
failures.0.cause.reason: /Not.enough.active.copies.to.meet.write.consistency.of.\[QUORUM\].\(have.1,.needed.4\)..Timeout\:.\[1s\],.request:.\[BulkShardRequest.to.\[test\].containing.\[1\].requests\]/ failures.0.cause.reason: /Not.enough.active.copies.to.meet.write.consistency.of.\[QUORUM\].\(have.1,.needed.4\)..Timeout\:.\[1s\],.request:.\[BulkShardRequest.to.\[test\].containing.\[1\].requests\]/
@ -32,7 +31,6 @@
update-by-query: update-by-query:
index: test index: test
consistency: one consistency: one
wait_for_completion: true
- match: {failures: []} - match: {failures: []}
- match: {updated: 1} - match: {updated: 1}
- match: {version_conflicts: 0} - match: {version_conflicts: 0}

9
qa/smoke-test-reindex-with-groovy/src/test/resources/rest-api-spec/test/reindex/10_script.yaml
View File

@ -12,7 +12,6 @@
- do: - do:
reindex: reindex:
refresh: true refresh: true
wait_for_completion: true
body: body:
source: source:
index: twitter index: twitter
@ -52,7 +51,6 @@
- do: - do:
reindex: reindex:
refresh: true refresh: true
wait_for_completion: true
body: body:
source: source:
index: twitter index: twitter
@ -112,7 +110,6 @@
- do: - do:
reindex: reindex:
refresh: true refresh: true
wait_for_completion: true
body: body:
source: source:
index: twitter index: twitter
@ -156,7 +153,6 @@
- do: - do:
reindex: reindex:
refresh: true refresh: true
wait_for_completion: true
body: body:
source: source:
index: twitter index: twitter
@ -215,7 +211,6 @@
- do: - do:
reindex: reindex:
refresh: true refresh: true
wait_for_completion: true
body: body:
source: source:
index: twitter index: twitter
@ -261,7 +256,6 @@
- do: - do:
reindex: reindex:
refresh: true refresh: true
wait_for_completion: true
body: body:
source: source:
index: twitter index: twitter
@ -309,7 +303,6 @@
- do: - do:
reindex: reindex:
wait_for_completion: true
body: body:
source: source:
index: twitter index: twitter
@ -343,7 +336,6 @@
- do: - do:
reindex: reindex:
wait_for_completion: true
refresh: true refresh: true
body: body:
source: source:
@ -385,7 +377,6 @@
- do: - do:
reindex: reindex:
refresh: true refresh: true
wait_for_completion: true
body: body:
source: source:
index: twitter index: twitter

5
qa/smoke-test-reindex-with-groovy/src/test/resources/rest-api-spec/test/update-by-query/10_script.yaml
View File

@ -13,7 +13,6 @@
update-by-query: update-by-query:
index: twitter index: twitter
refresh: true refresh: true
wait_for_completion: true
body: body:
script: script:
inline: ctx._source.user = "not" + ctx._source.user inline: ctx._source.user = "not" + ctx._source.user
@ -50,7 +49,6 @@
update-by-query: update-by-query:
refresh: true refresh: true
index: twitter index: twitter
wait_for_completion: true
body: body:
script: script:
inline: if (ctx._source.user == "kimchy") {ctx._source.user = "not" + ctx._source.user} else {ctx.op = "noop"} inline: if (ctx._source.user == "kimchy") {ctx._source.user = "not" + ctx._source.user} else {ctx.op = "noop"}
@ -96,7 +94,6 @@
update-by-query: update-by-query:
refresh: true refresh: true
index: twitter index: twitter
wait_for_completion: true
body: body:
script: script:
inline: ctx.op = "noop" inline: ctx.op = "noop"
@ -119,7 +116,6 @@
catch: /Invalid fields added to ctx \[junk\]/ catch: /Invalid fields added to ctx \[junk\]/
update-by-query: update-by-query:
index: twitter index: twitter
wait_for_completion: true
body: body:
script: script:
inline: ctx.junk = "stuff" inline: ctx.junk = "stuff"
@ -139,7 +135,6 @@
catch: /Modifying \[_id\] not allowed/ catch: /Modifying \[_id\] not allowed/
update-by-query: update-by-query:
index: twitter index: twitter
wait_for_completion: true
body: body:
script: script:
inline: ctx._id = "stuff" inline: ctx._id = "stuff"