Skip to content

Commit 76ff6e8

Browse files
DaveCTurnerDaveCTurner
committed
Merge branch 'master' into peer-recovery-retention-leases
2 parents d016e79 + 399d53e commit 76ff6e8

File tree

112 files changed

+1309
-984
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+1309
-984
lines changed

‎client/rest-high-level/src/test/java/org/elasticsearch/client/IndicesClientIT.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,7 @@ public void testIndicesExistsWithTypes() throws IOException {
192192
= new org.elasticsearch.action.admin.indices.get.GetIndexRequest();
193193
request.indices(indexName);
194194

195-
boolean response = execute(request, highLevelClient().indices()::exists, highLevelClient().indices()::existsAsync,
196-
expectWarnings(RestGetIndicesAction.TYPES_DEPRECATION_MESSAGE));
195+
boolean response = execute(request, highLevelClient().indices()::exists, highLevelClient().indices()::existsAsync);
197196
assertTrue(response);
198197
}
199198

‎client/rest-high-level/src/test/java/org/elasticsearch/client/MachineLearningIT.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@
164164
import static org.hamcrest.CoreMatchers.hasItem;
165165
import static org.hamcrest.CoreMatchers.hasItems;
166166
import static org.hamcrest.CoreMatchers.not;
167+
import static org.hamcrest.Matchers.anyOf;
167168
import static org.hamcrest.Matchers.closeTo;
168169
import static org.hamcrest.Matchers.contains;
169170
import static org.hamcrest.Matchers.containsInAnyOrder;
@@ -1438,7 +1439,8 @@ public void testStopDataFrameAnalyticsConfig() throws Exception {
14381439
new StartDataFrameAnalyticsRequest(configId),
14391440
machineLearningClient::startDataFrameAnalytics, machineLearningClient::startDataFrameAnalyticsAsync);
14401441
assertTrue(startDataFrameAnalyticsResponse.isAcknowledged());
1441-
assertThat(getAnalyticsState(configId), equalTo(DataFrameAnalyticsState.STARTED));
1442+
assertThat(getAnalyticsState(configId), anyOf(equalTo(DataFrameAnalyticsState.STARTED),
1443+
equalTo(DataFrameAnalyticsState.REINDEXING), equalTo(DataFrameAnalyticsState.ANALYZING)));
14421444

14431445
StopDataFrameAnalyticsResponse stopDataFrameAnalyticsResponse = execute(
14441446
new StopDataFrameAnalyticsRequest(configId),

‎docs/plugins/repository-s3.asciidoc

+14-4
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,20 @@ settings belong in the `elasticsearch.yml` file.
145145
Whether retries should be throttled (i.e. should back off). Must be `true`
146146
or `false`. Defaults to `true`.
147147

148+
`path_style_access`::
149+
150+
Whether to force the use of the path style access pattern. If `true`, the
151+
path style access pattern will be used. If `false`, the access pattern will
152+
be automatically determined by the AWS Java SDK (See
153+
https://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/services/s3/AmazonS3Builder.html#setPathStyleAccessEnabled-java.lang.Boolean-[AWS
154+
documentation] for details). Defaults to `false`.
155+
156+
[[repository-s3-path-style-deprecation]]
157+
NOTE: In versions `7.0`, `7.1`, `7.2` and `7.3` all bucket operations used the
158+
https://aws.amazon.com/blogs/aws/amazon-s3-path-deprecation-plan-the-rest-of-the-story/[now-deprecated]
159+
path style access pattern. If your deployment requires the path style access
160+
pattern then you should set this setting to `true` when upgrading.
161+
148162
[float]
149163
[[repository-s3-compatible-services]]
150164
===== S3-compatible services
@@ -381,10 +395,6 @@ bucket, in this example, named "foo".
381395
The bucket needs to exist to register a repository for snapshots. If you did not
382396
create the bucket then the repository registration will fail.
383397

384-
Note: Starting in version 7.0, all bucket operations are using the path style
385-
access pattern. In previous versions the decision to use virtual hosted style or
386-
path style access was made by the AWS Java SDK.
387-
388398
[[repository-s3-aws-vpc]]
389399
[float]
390400
==== AWS VPC Bandwidth Settings

‎docs/reference/ccr/apis/auto-follow/delete-auto-follow-pattern.asciidoc

+20-13
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,8 @@
88

99
Delete auto-follow patterns.
1010

11-
==== Description
12-
13-
This API deletes a configured collection of
14-
{stack-ov}/ccr-auto-follow.html[auto-follow patterns].
15-
16-
==== Request
11+
[[ccr-delete-auto-follow-pattern-request]]
12+
==== {api-request-title}
1713

1814
//////////////////////////
1915
@@ -42,17 +38,28 @@ DELETE /_ccr/auto_follow/<auto_follow_pattern_name>
4238
// CONSOLE
4339
// TEST[s/<auto_follow_pattern_name>/my_auto_follow_pattern/]
4440

45-
==== Path Parameters
46-
`auto_follow_pattern_name` (required)::
47-
(string) specifies the auto-follow pattern collection to delete
48-
49-
==== Authorization
41+
[[ccr-delete-auto-follow-pattern-prereqs]]
42+
==== {api-prereq-title}
5043

51-
If the {es} {security-features} are enabled, you must have `manage_ccr` cluster
44+
* If the {es} {security-features} are enabled, you must have `manage_ccr` cluster
5245
privileges on the cluster that contains the follower index. For more information,
5346
see {stack-ov}/security-privileges.html[Security privileges].
5447

55-
==== Example
48+
[[ccr-delete-auto-follow-pattern-desc]]
49+
==== {api-description-title}
50+
51+
This API deletes a configured collection of
52+
{stack-ov}/ccr-auto-follow.html[auto-follow patterns].
53+
54+
[[ccr-delete-auto-follow-pattern-path-parms]]
55+
==== {api-path-parms-title}
56+
57+
`<auto_follow_pattern_name>` (Required)::
58+
(string) Specifies the auto-follow pattern collection to delete.
59+
60+
61+
[[ccr-delete-auto-follow-pattern-examples]]
62+
==== {api-examples-title}
5663

5764
This example deletes an auto-follow pattern collection named
5865
`my_auto_follow_pattern`:

‎docs/reference/ccr/apis/auto-follow/get-auto-follow-pattern.asciidoc

+21-15
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,8 @@
88

99
Get auto-follow patterns.
1010

11-
==== Description
12-
13-
This API gets configured {stack-ov}/ccr-auto-follow.html[auto-follow patterns].
14-
This API will return the specified auto-follow pattern collection.
15-
16-
==== Request
11+
[[ccr-get-auto-follow-pattern-request]]
12+
==== {api-request-title}
1713

1814
//////////////////////////
1915
@@ -56,19 +52,29 @@ GET /_ccr/auto_follow/<auto_follow_pattern_name>
5652
// CONSOLE
5753
// TEST[s/<auto_follow_pattern_name>/my_auto_follow_pattern/]
5854

59-
==== Path Parameters
60-
`auto_follow_pattern_name`::
61-
(string) specifies the auto-follow pattern collection that you want to
62-
retrieve; if you do not specify a name, the API returns information for all
63-
collections
64-
65-
==== Authorization
55+
[[ccr-get-auto-follow-pattern-prereqs]]
56+
==== {api-prereq-title}
6657

67-
If the {es} {security-features} are enabled, you must have `manage_ccr` cluster
58+
* If the {es} {security-features} are enabled, you must have `manage_ccr` cluster
6859
privileges on the cluster that contains the follower index. For more information,
6960
see {stack-ov}/security-privileges.html[Security privileges].
7061

71-
==== Example
62+
[[ccr-get-auto-follow-pattern-desc]]
63+
==== {api-description-title}
64+
65+
This API gets configured {stack-ov}/ccr-auto-follow.html[auto-follow patterns].
66+
This API will return the specified auto-follow pattern collection.
67+
68+
[[ccr-get-auto-follow-pattern-path-parms]]
69+
==== {api-path-parms-title}
70+
71+
`<auto_follow_pattern_name>` (Optional)::
72+
(string) Specifies the auto-follow pattern collection that you want to
73+
retrieve. If you do not specify a name, the API returns information for all
74+
collections.
75+
76+
[[ccr-get-auto-follow-pattern-examples]]
77+
==== {api-examples-title}
7278

7379
This example retrieves information about an auto-follow pattern collection
7480
named `my_auto_follow_pattern`:

‎docs/reference/ccr/apis/auto-follow/put-auto-follow-pattern.asciidoc

+38-31
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,8 @@
88

99
Creates an auto-follow pattern.
1010

11-
==== Description
12-
13-
This API creates a new named collection of
14-
{stack-ov}/ccr-auto-follow.html[auto-follow patterns] against the remote cluster
15-
specified in the request body. Newly created indices on the remote cluster
16-
matching any of the specified patterns will be automatically configured as follower
17-
indices.
18-
19-
==== Request
11+
[[ccr-put-auto-follow-pattern-request]]
12+
==== {api-request-title}
2013

2114
[source,js]
2215
--------------------------------------------------
@@ -48,35 +41,49 @@ DELETE /_ccr/auto_follow/auto_follow_pattern_name
4841
4942
//////////////////////////
5043

51-
==== Path Parameters
52-
`auto_follow_pattern_name` (required)::
53-
(string) name of the collection of auto-follow patterns
44+
[[ccr-put-auto-follow-pattern-prereqs]]
45+
==== {api-prereq-title}
5446

55-
==== Request Body
56-
`remote_cluster`::
57-
(required string) the <<modules-remote-clusters,remote cluster>> containing the
58-
leader indices to match against
47+
* If the {es} {security-features} are enabled, you must have `read` and `monitor`
48+
index privileges for the leader index patterns. You must also have `manage_ccr`
49+
cluster privileges on the cluster that contains the follower index. For more
50+
information, see
51+
{stack-ov}/security-privileges.html[Security privileges].
5952

60-
`leader_index_patterns`::
61-
(array) an array of simple index patterns to match against indices in the
62-
remote cluster specified by the `remote_cluster` field
53+
[[ccr-put-auto-follow-pattern-desc]]
54+
==== {api-description-title}
6355

64-
`follow_index_pattern`::
65-
(string) the name of follower index; the template `{{leader_index}}` can be
66-
used to derive the name of the follower index from the name of the leader
67-
index
56+
This API creates a new named collection of
57+
{stack-ov}/ccr-auto-follow.html[auto-follow patterns] against the remote cluster
58+
specified in the request body. Newly created indices on the remote cluster
59+
matching any of the specified patterns will be automatically configured as follower
60+
indices.
6861

69-
include::../follow-request-body.asciidoc[]
62+
[[ccr-put-auto-follow-pattern-path-parms]]
63+
==== {api-path-parms-title}
64+
`<auto_follow_pattern_name>` (Required)::
65+
(string) The name of the collection of auto-follow patterns.
7066

71-
==== Authorization
67+
[[ccr-put-auto-follow-pattern-request-body]]
68+
==== {api-request-body-title}
7269

73-
If the {es} {security-features} are enabled, you must have `read` and `monitor`
74-
index privileges for the leader index patterns. You must also have `manage_ccr`
75-
cluster privileges on the cluster that contains the follower index. For more
76-
information, see
77-
{stack-ov}/security-privileges.html[Security privileges].
70+
`remote_cluster` (Required)::
71+
(string) The <<modules-remote-clusters,remote cluster>> containing the
72+
leader indices to match against.
73+
74+
`leader_index_patterns` (Optional)::
75+
(array) An array of simple index patterns to match against indices in the
76+
remote cluster specified by the `remote_cluster` field.
77+
78+
`follow_index_pattern` (Optional)::
79+
(string) The name of follower index. The template `{{leader_index}}` can be
80+
used to derive the name of the follower index from the name of the leader
81+
index.
82+
83+
include::../follow-request-body.asciidoc[]
7884

79-
==== Example
85+
[[ccr-put-auto-follow-pattern-examples]]
86+
==== {api-examples-title}
8087

8188
This example creates an auto-follow pattern named `my_auto_follow_pattern`:
8289

‎docs/reference/ccr/apis/follow-request-body.asciidoc

+26-25
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,49 @@
11
[testenv="platinum"]
22
`max_read_request_operation_count`::
3-
(integer) the maximum number of operations to pull per read from the remote
4-
cluster
3+
(integer) The maximum number of operations to pull per read from the remote
4+
cluster.
55

66
`max_outstanding_read_requests`::
7-
(long) the maximum number of outstanding reads requests from the remote
8-
cluster
7+
(long) The maximum number of outstanding reads requests from the remote
8+
cluster.
99

1010
`max_read_request_size`::
11-
(<<byte-units,byte value>>) the maximum size in bytes of per read of a batch
12-
of operations pulled from the remote cluster
11+
(<<byte-units,byte value>>) The maximum size in bytes of per read of a batch
12+
of operations pulled from the remote cluster.
1313

1414
`max_write_request_operation_count`::
15-
(integer) the maximum number of operations per bulk write request executed on
16-
the follower
15+
(integer) The maximum number of operations per bulk write request executed on
16+
the follower.
1717

1818
`max_write_request_size`::
19-
(<<byte-units,byte value>>) the maximum total bytes of operations per bulk write request
20-
executed on the follower
19+
(<<byte-units,byte value>>) The maximum total bytes of operations per bulk write request
20+
executed on the follower.
2121

2222
`max_outstanding_write_requests`::
23-
(integer) the maximum number of outstanding write requests on the follower
23+
(integer) The maximum number of outstanding write requests on the follower.
2424

2525
`max_write_buffer_count`::
26-
(integer) the maximum number of operations that can be queued for writing;
27-
when this limit is reached, reads from the remote cluster will be deferred
28-
until the number of queued operations goes below the limit
26+
(integer) The maximum number of operations that can be queued for writing.
27+
When this limit is reached, reads from the remote cluster will be deferred
28+
until the number of queued operations goes below the limit.
2929

3030
`max_write_buffer_size`::
31-
(<<byte-units,byte value>>) the maximum total bytes of operations that can be queued for
32-
writing; when this limit is reached, reads from the remote cluster will be
33-
deferred until the total bytes of queued operations goes below the limit
31+
(<<byte-units,byte value>>) The maximum total bytes of operations that can be
32+
queued for
33+
writing. When this limit is reached, reads from the remote cluster will be
34+
deferred until the total bytes of queued operations goes below the limit.
3435

3536
`max_retry_delay`::
36-
(<<time-units,time value>>) the maximum time to wait before retrying an
37-
operation that failed exceptionally; an exponential backoff strategy is
38-
employed when retrying
37+
(<<time-units,time value>>) The maximum time to wait before retrying an
38+
operation that failed exceptionally. An exponential backoff strategy is
39+
employed when retrying.
3940

4041
`read_poll_timeout`::
41-
(<<time-units,time value>>) the maximum time to wait for new operations on the
42-
remote cluster when the follower index is synchronized with the leader index;
43-
when the timeout has elapsed, the poll for operations will return to the
44-
follower so that it can update some statistics, and then the follower will
45-
immediately attempt to read from the leader again
42+
(<<time-units,time value>>) The maximum time to wait for new operations on the
43+
remote cluster when the follower index is synchronized with the leader index.
44+
When the timeout has elapsed, the poll for operations will return to the
45+
follower so that it can update some statistics. Then the follower will
46+
immediately attempt to read from the leader again.
4647

4748
===== Default values
4849

0 commit comments

Comments
 (0)