Skip to content

Commit 56aabcd

Browse files
authored
Add retention to Snapshot Lifecycle Management (#46407)
This commit adds retention to the existing Snapshot Lifecycle Management feature (#38461) as described in #43663. This allows a user to configure SLM to automatically delete older snapshots based on a number of criteria. An example policy would look like: ``` PUT /_slm/policy/snapshot-every-day { "schedule": "0 30 2 * * ?", "name": "<production-snap-{now/d}>", "repository": "my-s3-repository", "config": { "indices": ["foo-*", "important"] }, // Newly configured retention options "retention": { // Snapshots should be deleted after 14 days "expire_after": "14d", // Keep a maximum of thirty snapshots "max_count": 30, // Keep a minimum of the four most recent snapshots "min_count": 4 } } ``` SLM Retention is run on a scheduled configurable with the `slm.retention_schedule` setting, which supports cron expressions. Deletions are run for a configurable time bounded by the `slm.retention_duration` setting, which defaults to 1 hour. Included in this work is a new SLM stats API endpoint available through ``` json GET /_slm/stats ``` That returns statistics about snapshot taken and deleted, as well as successful retention runs, failures, and the time spent deleting snapshots. #45362 has more information as well as an example of the output. These stats are also included when retrieving SLM policies via the API. * Add base framework for snapshot retention (#43605) * Add base framework for snapshot retention This adds a basic `SnapshotRetentionService` and `SnapshotRetentionTask` to start as the basis for SLM's retention implementation. Relates to #38461 * Remove extraneous 'public' * Use a local var instead of reading class var repeatedly * Add SnapshotRetentionConfiguration for retention configuration (#43777) * Add SnapshotRetentionConfiguration for retention configuration This commit adds the `SnapshotRetentionConfiguration` class and its HLRC counterpart to encapsulate the configuration for SLM retention. Currently only a single parameter is supported as an example (we still need to discuss the different options we want to support and their names) to keep the size of the PR down. It also does not yet include version serialization checks since the original SLM branch has not yet been merged. Relates to #43663 * Fix REST tests * Fix more documentation * Use Objects.equals to avoid NPE * Put `randomSnapshotLifecyclePolicy` in only one place * Occasionally return retention with no configuration * Implement SnapshotRetentionTask's snapshot filtering and delet… (#44764) * Implement SnapshotRetentionTask's snapshot filtering and deletion This commit implements the snapshot filtering and deletion for `SnapshotRetentionTask`. Currently only the expire-after age is used for determining whether a snapshot is eligible for deletion. Relates to #43663 * Fix deletes running on the wrong thread * Handle missing or null policy in snap metadata differently * Convert Tuple<String, List<SnapshotInfo>> to Map<String, List<SnapshotInfo>> * Use the `OriginSettingClient` to work with security, enhance logging * Prevent NPE in test by mocking Client * Allow empty/missing SLM retention configuration (#45018) Semi-related to #44465, this allows the `"retention"` configuration map to be missing. Relates to #43663 * Add min_count and max_count as SLM retention predicates (#44926) This adds the configuration options for `min_count` and `max_count` as well as the logic for determining whether a snapshot meets this criteria to SLM's retention feature. These options are optional and one, two, or all three can be specified in an SLM policy. Relates to #43663 * Time-bound deletion of snapshots in retention delete function (#45065) * Time-bound deletion of snapshots in retention delete function With a cluster that has a large number of snapshots, it's possible that snapshot deletion can take a very long time (especially since deletes currently have to happen in a serial fashion). To prevent snapshot deletion from taking forever in a cluster and blocking other operations, this commit adds a setting to allow configuring a maximum time to spend deletion snapshots during retention. This dynamic setting defaults to 1 hour and is best-effort, meaning that it doesn't hard stop a deletion at an hour mark, but ensures that once the time has passed, all subsequent deletions are deferred until the next retention cycle. Relates to #43663 * Wow snapshots suuuure can take a long time. * Use a LongSupplier instead of actually sleeping * Remove TestLogging annotation * Remove rate limiting * Add SLM metrics gathering and endpoint (#45362) * Add SLM metrics gathering and endpoint This commit adds the infrastructure to gather metrics about the different SLM actions that a cluster takes. These actions are stored in `SnapshotLifecycleStats` and perpetuated in cluster state. The stats stored include the number of snapshots taken, failed, deleted, the number of retention runs, as well as per-policy counts for snapshots taken, failed, and deleted. It also includes the amount of time spent deleting snapshots from SLM retention. This commit also adds an endpoint for retrieving all stats (further commits will expose this in the SLM get-policy API) that looks like: ``` GET /_slm/stats { "retention_runs" : 13, "retention_failed" : 0, "retention_timed_out" : 0, "retention_deletion_time" : "1.4s", "retention_deletion_time_millis" : 1404, "policy_metrics" : { "daily-snapshots2" : { "snapshots_taken" : 7, "snapshots_failed" : 0, "snapshots_deleted" : 6, "snapshot_deletion_failures" : 0 }, "daily-snapshots" : { "snapshots_taken" : 12, "snapshots_failed" : 0, "snapshots_deleted" : 12, "snapshot_deletion_failures" : 6 } }, "total_snapshots_taken" : 19, "total_snapshots_failed" : 0, "total_snapshots_deleted" : 18, "total_snapshot_deletion_failures" : 6 } ``` This does not yet include HLRC for this, as this commit is quite large on its own. That will be added in a subsequent commit. Relates to #43663 * Version qualify serialization * Initialize counters outside constructor * Use computeIfAbsent instead of being too verbose * Move part of XContent generation into subclass * Fix REST action for master merge * Unused import * Record history of SLM retention actions (#45513) This commit records the deletion of snapshots by the retention component of SLM into the SLM history index for the purposes of reviewing operations taken by SLM and alerting. * Retry SLM retention after currently running snapshot completes (#45802) * Retry SLM retention after currently running snapshot completes This commit adds a ClusterStateObserver to wait until the currently running snapshot is complete before proceeding with snapshot deletion. SLM retention waits for the maximum allowed deletion time for the snapshot to complete, however, the waiting time is not factored into the limit on actual deletions. Relates to #43663 * Increase timeout waiting for snapshot completion * Apply patch From https://github.com/original-brownbear/elasticsearch/commit/2374316f0d1912c9e1498bece195546a1dc60bce.patch * Rename test variables * [TEST] Be less strict for stats checking * Skip SLM retention if ILM is STOPPING or STOPPED (#45869) This adds a check to ensure we take no action during SLM retention if ILM is currently stopped or in the process of stopping. Relates to #43663 * Check all actions preventing snapshot delete during retention (#45992) * Check all actions preventing snapshot delete during retention run Previously we only checked to see if a snapshot was currently running, but it turns out that more things can block snapshot deletion. This changes the check to be a check for: - a snapshot currently running - a deletion already in progress - a repo cleanup in progress - a restore currently running This was found by CI where a third party delete in a test caused SLM retention deletion to throw an exception. Relates to #43663 * Add unit test for okayToDeleteSnapshots * Fix bug where SLM retention task would be scheduled on every node * Enhance test logging * Ignore if snapshot is already deleted * Missing import * Fix SnapshotRetentionServiceTests * Expose SLM policy stats in get SLM policy API (#45989) This also adds support for the SLM stats endpoint to the high level rest client. Retrieving a policy now looks like: ```json { "daily-snapshots" : { "version": 1, "modified_date": "2019-04-23T01:30:00.000Z", "modified_date_millis": 1556048137314, "policy" : { "schedule": "0 30 1 * * ?", "name": "<daily-snap-{now/d}>", "repository": "my_repository", "config": { "indices": ["data-*", "important"], "ignore_unavailable": false, "include_global_state": false }, "retention": {} }, "stats": { "snapshots_taken": 0, "snapshots_failed": 0, "snapshots_deleted": 0, "snapshot_deletion_failures": 0 }, "next_execution": "2019-04-24T01:30:00.000Z", "next_execution_millis": 1556048160000 } } ``` Relates to #43663 * Rewrite SnapshotLifecycleIT as as ESIntegTestCase (#46356) * Rewrite SnapshotLifecycleIT as as ESIntegTestCase This commit splits `SnapshotLifecycleIT` into two different tests. `SnapshotLifecycleRestIT` which includes the tests that do not require slow repositories, and `SLMSnapshotBlockingIntegTests` which is now an integration test using `MockRepository` to simulate a snapshot being in progress. Relates to #43663 Resolves #46205 * Add error logging when exceptions are thrown
1 parent 5c78f60 commit 56aabcd

File tree

56 files changed

+3767
-226
lines changed

Some content is hidden

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

56 files changed

+3767
-226
lines changed

client/rest-high-level/src/main/java/org/elasticsearch/client/IndexLifecycleClient.java

+38
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@
3939
import org.elasticsearch.client.slm.ExecuteSnapshotLifecyclePolicyResponse;
4040
import org.elasticsearch.client.slm.GetSnapshotLifecyclePolicyRequest;
4141
import org.elasticsearch.client.slm.GetSnapshotLifecyclePolicyResponse;
42+
import org.elasticsearch.client.slm.GetSnapshotLifecycleStatsRequest;
43+
import org.elasticsearch.client.slm.GetSnapshotLifecycleStatsResponse;
4244
import org.elasticsearch.client.slm.PutSnapshotLifecyclePolicyRequest;
4345

4446
import java.io.IOException;
@@ -464,4 +466,40 @@ public Cancellable executeSnapshotLifecyclePolicyAsync(
464466
request, IndexLifecycleRequestConverters::executeSnapshotLifecyclePolicy,
465467
options, ExecuteSnapshotLifecyclePolicyResponse::fromXContent, listener, emptySet());
466468
}
469+
470+
/**
471+
* Retrieve snapshot lifecycle statistics.
472+
* See <pre>
473+
* https://www.elastic.co/guide/en/elasticsearch/client/java-rest/current/
474+
* java-rest-high-ilm-slm-get-snapshot-lifecycle-stats.html
475+
* </pre>
476+
* for more.
477+
* @param request the request
478+
* @param options the request options (e.g. headers), use {@link RequestOptions#DEFAULT} if nothing needs to be customized
479+
* @return the response
480+
* @throws IOException in case there is a problem sending the request or parsing back the response
481+
*/
482+
public GetSnapshotLifecycleStatsResponse getSnapshotLifecycleStats(GetSnapshotLifecycleStatsRequest request,
483+
RequestOptions options) throws IOException {
484+
return restHighLevelClient.performRequestAndParseEntity(request, IndexLifecycleRequestConverters::getSnapshotLifecycleStats,
485+
options, GetSnapshotLifecycleStatsResponse::fromXContent, emptySet());
486+
}
487+
488+
/**
489+
* Asynchronously retrieve snapshot lifecycle statistics.
490+
* See <pre>
491+
* https://www.elastic.co/guide/en/elasticsearch/client/java-rest/current/
492+
* java-rest-high-ilm-slm-get-snapshot-lifecycle-stats.html
493+
* </pre>
494+
* for more.
495+
* @param request the request
496+
* @param options the request options (e.g. headers), use {@link RequestOptions#DEFAULT} if nothing needs to be customized
497+
* @param listener the listener to be notified upon request completion
498+
* @return cancellable that may be used to cancel the request
499+
*/
500+
public Cancellable getSnapshotLifecycleStatsAsync(GetSnapshotLifecycleStatsRequest request, RequestOptions options,
501+
ActionListener<GetSnapshotLifecycleStatsResponse> listener) {
502+
return restHighLevelClient.performRequestAsyncAndParseEntity(request, IndexLifecycleRequestConverters::getSnapshotLifecycleStats,
503+
options, GetSnapshotLifecycleStatsResponse::fromXContent, listener, emptySet());
504+
}
467505
}

client/rest-high-level/src/main/java/org/elasticsearch/client/IndexLifecycleRequestConverters.java

+11
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import org.elasticsearch.client.slm.DeleteSnapshotLifecyclePolicyRequest;
3636
import org.elasticsearch.client.slm.ExecuteSnapshotLifecyclePolicyRequest;
3737
import org.elasticsearch.client.slm.GetSnapshotLifecyclePolicyRequest;
38+
import org.elasticsearch.client.slm.GetSnapshotLifecycleStatsRequest;
3839
import org.elasticsearch.client.slm.PutSnapshotLifecyclePolicyRequest;
3940
import org.elasticsearch.common.Strings;
4041

@@ -215,4 +216,14 @@ static Request executeSnapshotLifecyclePolicy(ExecuteSnapshotLifecyclePolicyRequ
215216
request.addParameters(params.asMap());
216217
return request;
217218
}
219+
220+
static Request getSnapshotLifecycleStats(GetSnapshotLifecycleStatsRequest getSnapshotLifecycleStatsRequest) {
221+
String endpoint = new RequestConverters.EndpointBuilder().addPathPartAsIs("_slm/stats").build();
222+
Request request = new Request(HttpGet.METHOD_NAME, endpoint);
223+
RequestConverters.Params params = new RequestConverters.Params();
224+
params.withMasterTimeout(getSnapshotLifecycleStatsRequest.masterNodeTimeout());
225+
params.withTimeout(getSnapshotLifecycleStatsRequest.timeout());
226+
request.addParameters(params.asMap());
227+
return request;
228+
}
218229
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
/*
2+
* Licensed to Elasticsearch under one or more contributor
3+
* license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright
5+
* ownership. Elasticsearch licenses this file to you under
6+
* the Apache License, Version 2.0 (the "License"); you may
7+
* not use this file except in compliance with the License.
8+
* You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
20+
package org.elasticsearch.client.slm;
21+
22+
import org.elasticsearch.client.TimedRequest;
23+
24+
public class GetSnapshotLifecycleStatsRequest extends TimedRequest {
25+
26+
public GetSnapshotLifecycleStatsRequest() {
27+
super();
28+
}
29+
30+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
/*
2+
* Licensed to Elasticsearch under one or more contributor
3+
* license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright
5+
* ownership. Elasticsearch licenses this file to you under
6+
* the Apache License, Version 2.0 (the "License"); you may
7+
* not use this file except in compliance with the License.
8+
* You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
20+
package org.elasticsearch.client.slm;
21+
22+
import org.elasticsearch.common.xcontent.ToXContentObject;
23+
import org.elasticsearch.common.xcontent.XContentBuilder;
24+
import org.elasticsearch.common.xcontent.XContentParser;
25+
26+
import java.io.IOException;
27+
import java.util.Objects;
28+
29+
public class GetSnapshotLifecycleStatsResponse implements ToXContentObject {
30+
31+
private final SnapshotLifecycleStats stats;
32+
33+
public GetSnapshotLifecycleStatsResponse(SnapshotLifecycleStats stats) {
34+
this.stats = stats;
35+
}
36+
37+
public SnapshotLifecycleStats getStats() {
38+
return this.stats;
39+
}
40+
41+
public static GetSnapshotLifecycleStatsResponse fromXContent(XContentParser parser) throws IOException {
42+
return new GetSnapshotLifecycleStatsResponse(SnapshotLifecycleStats.parse(parser));
43+
}
44+
45+
@Override
46+
public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
47+
return stats.toXContent(builder, params);
48+
}
49+
50+
@Override
51+
public boolean equals(Object o) {
52+
if (this == o) {
53+
return true;
54+
}
55+
56+
if (o == null || getClass() != o.getClass()) {
57+
return false;
58+
}
59+
60+
GetSnapshotLifecycleStatsResponse other = (GetSnapshotLifecycleStatsResponse) o;
61+
return Objects.equals(this.stats, other.stats);
62+
}
63+
64+
@Override
65+
public int hashCode() {
66+
return Objects.hash(this.stats);
67+
}
68+
}

client/rest-high-level/src/main/java/org/elasticsearch/client/slm/SnapshotLifecyclePolicy.java

+23-8
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,13 @@ public class SnapshotLifecyclePolicy implements ToXContentObject {
3838
private final String schedule;
3939
private final String repository;
4040
private final Map<String, Object> configuration;
41+
private final SnapshotRetentionConfiguration retentionPolicy;
4142

4243
private static final ParseField NAME = new ParseField("name");
4344
private static final ParseField SCHEDULE = new ParseField("schedule");
4445
private static final ParseField REPOSITORY = new ParseField("repository");
4546
private static final ParseField CONFIG = new ParseField("config");
47+
private static final ParseField RETENTION = new ParseField("retention");
4648

4749
@SuppressWarnings("unchecked")
4850
private static final ConstructingObjectParser<SnapshotLifecyclePolicy, String> PARSER =
@@ -52,23 +54,27 @@ public class SnapshotLifecyclePolicy implements ToXContentObject {
5254
String schedule = (String) a[1];
5355
String repo = (String) a[2];
5456
Map<String, Object> config = (Map<String, Object>) a[3];
55-
return new SnapshotLifecyclePolicy(id, name, schedule, repo, config);
57+
SnapshotRetentionConfiguration retention = (SnapshotRetentionConfiguration) a[4];
58+
return new SnapshotLifecyclePolicy(id, name, schedule, repo, config, retention);
5659
});
5760

5861
static {
5962
PARSER.declareString(ConstructingObjectParser.constructorArg(), NAME);
6063
PARSER.declareString(ConstructingObjectParser.constructorArg(), SCHEDULE);
6164
PARSER.declareString(ConstructingObjectParser.constructorArg(), REPOSITORY);
6265
PARSER.declareObject(ConstructingObjectParser.optionalConstructorArg(), (p, c) -> p.map(), CONFIG);
66+
PARSER.declareObject(ConstructingObjectParser.optionalConstructorArg(), SnapshotRetentionConfiguration::parse, RETENTION);
6367
}
6468

6569
public SnapshotLifecyclePolicy(final String id, final String name, final String schedule,
66-
final String repository, @Nullable Map<String, Object> configuration) {
67-
this.id = Objects.requireNonNull(id);
68-
this.name = name;
69-
this.schedule = schedule;
70-
this.repository = repository;
70+
final String repository, @Nullable final Map<String, Object> configuration,
71+
@Nullable final SnapshotRetentionConfiguration retentionPolicy) {
72+
this.id = Objects.requireNonNull(id, "policy id is required");
73+
this.name = Objects.requireNonNull(name, "policy snapshot name is required");
74+
this.schedule = Objects.requireNonNull(schedule, "policy schedule is required");
75+
this.repository = Objects.requireNonNull(repository, "policy snapshot repository is required");
7176
this.configuration = configuration;
77+
this.retentionPolicy = retentionPolicy;
7278
}
7379

7480
public String getId() {
@@ -92,6 +98,11 @@ public Map<String, Object> getConfig() {
9298
return this.configuration;
9399
}
94100

101+
@Nullable
102+
public SnapshotRetentionConfiguration getRetentionPolicy() {
103+
return this.retentionPolicy;
104+
}
105+
95106
public static SnapshotLifecyclePolicy parse(XContentParser parser, String id) {
96107
return PARSER.apply(parser, id);
97108
}
@@ -105,13 +116,16 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
105116
if (this.configuration != null) {
106117
builder.field(CONFIG.getPreferredName(), this.configuration);
107118
}
119+
if (this.retentionPolicy != null) {
120+
builder.field(RETENTION.getPreferredName(), this.retentionPolicy);
121+
}
108122
builder.endObject();
109123
return builder;
110124
}
111125

112126
@Override
113127
public int hashCode() {
114-
return Objects.hash(id, name, schedule, repository, configuration);
128+
return Objects.hash(id, name, schedule, repository, configuration, retentionPolicy);
115129
}
116130

117131
@Override
@@ -128,7 +142,8 @@ public boolean equals(Object obj) {
128142
Objects.equals(name, other.name) &&
129143
Objects.equals(schedule, other.schedule) &&
130144
Objects.equals(repository, other.repository) &&
131-
Objects.equals(configuration, other.configuration);
145+
Objects.equals(configuration, other.configuration) &&
146+
Objects.equals(retentionPolicy, other.retentionPolicy);
132147
}
133148

134149
@Override

client/rest-high-level/src/main/java/org/elasticsearch/client/slm/SnapshotLifecyclePolicyMetadata.java

+21-5
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ public class SnapshotLifecyclePolicyMetadata implements ToXContentObject {
4242
static final ParseField NEXT_EXECUTION_MILLIS = new ParseField("next_execution_millis");
4343
static final ParseField NEXT_EXECUTION = new ParseField("next_execution");
4444
static final ParseField SNAPSHOT_IN_PROGRESS = new ParseField("in_progress");
45+
static final ParseField POLICY_STATS = new ParseField("stats");
4546

4647
private final SnapshotLifecyclePolicy policy;
4748
private final long version;
@@ -53,6 +54,7 @@ public class SnapshotLifecyclePolicyMetadata implements ToXContentObject {
5354
private final SnapshotInvocationRecord lastFailure;
5455
@Nullable
5556
private final SnapshotInProgress snapshotInProgress;
57+
private final SnapshotLifecycleStats.SnapshotPolicyStats policyStats;
5658

5759
@SuppressWarnings("unchecked")
5860
public static final ConstructingObjectParser<SnapshotLifecyclePolicyMetadata, String> PARSER =
@@ -65,8 +67,9 @@ public class SnapshotLifecyclePolicyMetadata implements ToXContentObject {
6567
SnapshotInvocationRecord lastFailure = (SnapshotInvocationRecord) a[4];
6668
long nextExecution = (long) a[5];
6769
SnapshotInProgress sip = (SnapshotInProgress) a[6];
68-
69-
return new SnapshotLifecyclePolicyMetadata(policy, version, modifiedDate, lastSuccess, lastFailure, nextExecution, sip);
70+
SnapshotLifecycleStats.SnapshotPolicyStats stats = (SnapshotLifecycleStats.SnapshotPolicyStats) a[7];
71+
return new SnapshotLifecyclePolicyMetadata(policy, version, modifiedDate, lastSuccess,
72+
lastFailure, nextExecution, sip, stats);
7073
});
7174

7275
static {
@@ -77,6 +80,9 @@ public class SnapshotLifecyclePolicyMetadata implements ToXContentObject {
7780
PARSER.declareObject(ConstructingObjectParser.optionalConstructorArg(), SnapshotInvocationRecord::parse, LAST_FAILURE);
7881
PARSER.declareLong(ConstructingObjectParser.constructorArg(), NEXT_EXECUTION_MILLIS);
7982
PARSER.declareObject(ConstructingObjectParser.optionalConstructorArg(), SnapshotInProgress::parse, SNAPSHOT_IN_PROGRESS);
83+
PARSER.declareObject(ConstructingObjectParser.constructorArg(),
84+
(p, c) -> SnapshotLifecycleStats.SnapshotPolicyStats.parse(p, "policy"), POLICY_STATS);
85+
8086
}
8187

8288
public static SnapshotLifecyclePolicyMetadata parse(XContentParser parser, String id) {
@@ -86,14 +92,16 @@ public static SnapshotLifecyclePolicyMetadata parse(XContentParser parser, Strin
8692
public SnapshotLifecyclePolicyMetadata(SnapshotLifecyclePolicy policy, long version, long modifiedDate,
8793
SnapshotInvocationRecord lastSuccess, SnapshotInvocationRecord lastFailure,
8894
long nextExecution,
89-
@Nullable SnapshotInProgress snapshotInProgress) {
95+
@Nullable SnapshotInProgress snapshotInProgress,
96+
SnapshotLifecycleStats.SnapshotPolicyStats policyStats) {
9097
this.policy = policy;
9198
this.version = version;
9299
this.modifiedDate = modifiedDate;
93100
this.lastSuccess = lastSuccess;
94101
this.lastFailure = lastFailure;
95102
this.nextExecution = nextExecution;
96103
this.snapshotInProgress = snapshotInProgress;
104+
this.policyStats = policyStats;
97105
}
98106

99107
public SnapshotLifecyclePolicy getPolicy() {
@@ -124,6 +132,10 @@ public long getNextExecution() {
124132
return this.nextExecution;
125133
}
126134

135+
public SnapshotLifecycleStats.SnapshotPolicyStats getPolicyStats() {
136+
return this.policyStats;
137+
}
138+
127139
@Nullable
128140
public SnapshotInProgress getSnapshotInProgress() {
129141
return this.snapshotInProgress;
@@ -145,13 +157,16 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
145157
if (snapshotInProgress != null) {
146158
builder.field(SNAPSHOT_IN_PROGRESS.getPreferredName(), snapshotInProgress);
147159
}
160+
builder.startObject(POLICY_STATS.getPreferredName());
161+
this.policyStats.toXContent(builder, params);
162+
builder.endObject();
148163
builder.endObject();
149164
return builder;
150165
}
151166

152167
@Override
153168
public int hashCode() {
154-
return Objects.hash(policy, version, modifiedDate, lastSuccess, lastFailure, nextExecution);
169+
return Objects.hash(policy, version, modifiedDate, lastSuccess, lastFailure, nextExecution, policyStats);
155170
}
156171

157172
@Override
@@ -168,7 +183,8 @@ public boolean equals(Object obj) {
168183
Objects.equals(modifiedDate, other.modifiedDate) &&
169184
Objects.equals(lastSuccess, other.lastSuccess) &&
170185
Objects.equals(lastFailure, other.lastFailure) &&
171-
Objects.equals(nextExecution, other.nextExecution);
186+
Objects.equals(nextExecution, other.nextExecution) &&
187+
Objects.equals(policyStats, other.policyStats);
172188
}
173189

174190
public static class SnapshotInProgress implements ToXContentObject {

0 commit comments

Comments
 (0)