Miscellaneous ILM cleanups #118488
Merged
Miscellaneous ILM cleanups #118488
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The ordering of the phases and the removal and readdition of the hot phase are actually redundant, since the hot phase is the first ordered phase anyway.
joegallo
added
>non-issue
:Data Management/ILM+SLM
|
Pinging @elastic/es-data-management (Team:Data Management) |
joegallo
added
the
auto-backport
masseyke
reviewed
Dec 11, 2024
| Function<String, LifecycleAction> randomAction = getNameToActionFunction(); | ||
| // as what actions end up in the hot phase influence what actions are allowed in the subsequent phases we'll move the hot phase | ||
| // at the front of the phases to process (if it exists) | ||
| if (phaseNames.contains(TimeseriesLifecycleType.HOT_PHASE)) { |
There was a problem hiding this comment.
Do we not need to worry about HOT_PHASE coming first any more? I don't really understand why it was necessary in the first place.
There was a problem hiding this comment.
My read of it is that this code was maybe necessary once, but the loop after this that I didn't remove ended up making this code redundant anyway. https://github.com/elastic/elasticsearch/pull/118488/files/93a7c08283627686d9ef83f7e80793be004c8bb8#diff-ea4f8cb2981d1e363c5308fc815b3ce4f94ec116f7e9691d69bbe63d96c607a4R155-R161
masseyke
reviewed
Dec 11, 2024
| @@ -269,9 +269,8 @@ public Set<Step.StepKey> parseStepKeysFromPhase(String policy, String currentPha | |||
| return parseStepsFromPhase(policy, currentPhase, phaseDefNonNull).stream().map(Step::getKey).collect(Collectors.toSet()); | |||
| } catch (IOException e) { | |||
| logger.trace( | |||
| () -> String.format( | |||
| Locale.ROOT, | |||
| "unable to parse steps for policy [{}], phase [{}], and phase definition [{}]", | |||
There was a problem hiding this comment.
Oh nice -- we pick up a bug fix!
There was a problem hiding this comment.
Yeah, I'm just annoyed I didn't catch this on the first go around!
masseyke
reviewed
Dec 11, 2024
| @@ -1436,6 +1436,6 @@ private void assertClusterStateStepInfo( | |||
| assertEquals(expectedstepInfoValue, newLifecycleState.stepInfo()); | |||
| assertEquals(oldLifecycleState.phaseTime(), newLifecycleState.phaseTime()); | |||
| assertEquals(oldLifecycleState.actionTime(), newLifecycleState.actionTime()); | |||
| assertEquals(newLifecycleState.stepTime(), newLifecycleState.stepTime()); | |||
masseyke
approved these changes
Dec 11, 2024
💚 Backport successful
|
joegallo
added a commit
to joegallo/elasticsearch
that referenced
this pull request
Dec 11, 2024
elasticsearchmachine
pushed a commit
that referenced
this pull request
Dec 11, 2024
maxhniebergall
pushed a commit
to maxhniebergall/elasticsearch
that referenced
this pull request
Dec 16, 2024
maxhniebergall
pushed a commit
to maxhniebergall/elasticsearch
that referenced
this pull request
Dec 16, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is an unconnected bunch of commits that are just tidying some little things here and there that I ran into in the ILM code while I was working on my current task.
This is a continuation of #118466 and #118338, there's also a little bit of #118354 in there, too.