Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make use of new Get Snapshots Filtering in SLM Retention #77423

Merged
merged 7 commits into from
Sep 8, 2021
Merged

Make use of new Get Snapshots Filtering in SLM Retention #77423

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
47d0a8a
Make use of new Get Snapshots Filtering in SLM Retention
original-brownbear Sep 8, 2021
14c2b6f
Merge remote-tracking branch 'elastic/master' into use-policy-name-fi…
original-brownbear Sep 8, 2021
9a5c70b
Merge remote-tracking branch 'elastic/master' into use-policy-name-fi…
original-brownbear Sep 8, 2021
52d588c
Merge branch 'master' into use-policy-name-filtering-in-slm
elasticmachine Sep 8, 2021
73bcbda
Merge remote-tracking branch 'elastic/master' into use-policy-name-fi…
original-brownbear Sep 8, 2021
c028deb
redundant check
original-brownbear Sep 8, 2021
7d7ee29
Merge remote-tracking branch 'origin/use-policy-name-filtering-in-slm…
original-brownbear Sep 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/slm/SnapshotRetentionTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,7 @@ void getAllRetainableSnapshots(Collection<String> repositories,
// don't time out on this request to not produce failed SLM runs in case of a temporarily slow master node
.setMasterNodeTimeout(TimeValue.MAX_VALUE)
.setIgnoreUnavailable(true)
.setPolicies(policies.toArray(Strings.EMPTY_ARRAY))
.execute(ActionListener.wrap(resp -> {
if (logger.isTraceEnabled()) {
logger.trace("retrieved snapshots: {}",
Expand All @@ -252,10 +253,7 @@ void getAllRetainableSnapshots(Collection<String> repositories,
Map<String, List<SnapshotInfo>> snapshots = new HashMap<>();
for (SnapshotInfo info : resp.getSnapshots()) {
if (RETAINABLE_STATES.contains(info.state()) && info.userMetadata() != null) {
final Object policy = info.userMetadata().get(POLICY_ID_METADATA_FIELD);
if (policy instanceof String && policies.contains(policy)) {
snapshots.computeIfAbsent(info.repository(), repo -> new ArrayList<>()).add(info);
}
snapshots.computeIfAbsent(info.repository(), repo -> new ArrayList<>()).add(info);
}
}
listener.onResponse(snapshots);
Expand Down