honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Maintain step order for ILM trace logging (#39522) 

When trace logging is enabled we log the computed steps for a policy. This
commit makes sure that the steps that are logged are in the same order they will
be run when the policy executes. This makes it much easier to reason about the
policy if the move-to-step API is ever required in the future.
This commit is contained in:
Lee Hinman 2019-03-07 11:26:36 -07:00 committed by Lee Hinman
parent 4d41310be5
commit 8ec456b5df
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/indexlifecycle/PolicyStepsRegistry.java
View File

@ -39,6 +39,7 @@ import org.elasticsearch.xpack.core.indexlifecycle.TerminalPolicyStep;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
@ -125,7 +126,7 @@ public class PolicyStepsRegistry {
List<Step> policyAsSteps = policyMetadata.getPolicy().toSteps(policyClient); List<Step> policyAsSteps = policyMetadata.getPolicy().toSteps(policyClient);
if (policyAsSteps.isEmpty() == false) { if (policyAsSteps.isEmpty() == false) {
firstStepMap.put(policyMetadata.getName(), policyAsSteps.get(0)); firstStepMap.put(policyMetadata.getName(), policyAsSteps.get(0));
final Map<Step.StepKey, Step> stepMapForPolicy = new HashMap<>(); final Map<Step.StepKey, Step> stepMapForPolicy = new LinkedHashMap<>();
for (Step step : policyAsSteps) { for (Step step : policyAsSteps) {
assert ErrorStep.NAME.equals(step.getKey().getName()) == false : "unexpected error step in policy"; assert ErrorStep.NAME.equals(step.getKey().getName()) == false : "unexpected error step in policy";
stepMapForPolicy.put(step.getKey(), step); stepMapForPolicy.put(step.getKey(), step);