Skip to content

Commit b348429

Browse files
committed
Merge remote-tracking branch 'elastic/master' into execute-actions-under-permit-primary-mode-only
* elastic/master: Revert "Remove 7.0.2 (elastic#42282)" [DOCS] Copied note on slicing support to Slicing section. Closes 26114 (elastic#40426) Remove 7.0.2 (elastic#42282) Mute all ml_datafeed_crud rolling upgrade tests
2 parents 799f731 + 78259f7 commit b348429

File tree

4 files changed

+18
-0
lines changed

4 files changed

+18
-0
lines changed

docs/reference/docs/reindex.asciidoc

+4
Original file line numberDiff line numberDiff line change
@@ -982,6 +982,10 @@ Reindex supports <<sliced-scroll>> to parallelize the reindexing process.
982982
This parallelization can improve efficiency and provide a convenient way to
983983
break the request down into smaller parts.
984984

985+
NOTE: Reindexing from remote clusters does not support
986+
<<docs-reindex-manual-slice, manual>> or
987+
<<docs-reindex-automatic-slice, automatic slicing>>.
988+
985989
[float]
986990
[[docs-reindex-manual-slice]]
987991
==== Manual slicing

x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/40_ml_datafeed_crud.yml

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
setup:
2+
- skip:
3+
version: "all"
4+
reason: "AwaitsFix https://github.com/elastic/elasticsearch/issues/42258"
5+
16
---
27
"Test old cluster datafeed without aggs":
38
- do:

x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/40_ml_datafeed_crud.yml

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
setup:
2+
- skip:
3+
version: "all"
4+
reason: "AwaitsFix https://github.com/elastic/elasticsearch/issues/42258"
5+
16
---
27
"Put job and datafeed without aggs in old cluster":
38

x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/40_ml_datafeed_crud.yml

+4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
setup:
2+
- skip:
3+
version: "all"
4+
reason: "AwaitsFix https://github.com/elastic/elasticsearch/issues/42258"
5+
26
- do:
37
cluster.health:
48
wait_for_status: green

0 commit comments

Comments
 (0)