min conditions

server/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequest.java

@@ -24,15 +24,17 @@
 import org.elasticsearch.xcontent.XContentParser;
 
 import java.io.IOException;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 import static org.elasticsearch.action.ValidateActions.addValidationError;
 
 /**
  * Request class to swap index under an alias or increment data stream generation upon satisfying conditions
- *
+ * <p>
  * Note: there is a new class with the same name for the Java HLRC that uses a typeless format.
  * Any changes done to this class should also go to that client class.
  */
@@ -88,8 +90,7 @@ public class RolloverRequest extends AcknowledgedRequest<RolloverRequest> implem
             if (includeTypeName) {
                 // expecting one type only
                 for (Map.Entry<String, Object> mappingsEntry : parser.map().entrySet()) {
-                    @SuppressWarnings("unchecked")
-                    final Map<String, Object> value = (Map<String, Object>) mappingsEntry.getValue();
+                    @SuppressWarnings("unchecked") final Map<String, Object> value = (Map<String, Object>) mappingsEntry.getValue();
                     request.createIndexRequest.mapping(value);
                 }
             } else {
@@ -143,7 +144,8 @@ public RolloverRequest(StreamInput in) throws IOException {
         createIndexRequest = new CreateIndexRequest(in);
     }
 
-    RolloverRequest() {}
+    RolloverRequest() {
+    }
 
     public RolloverRequest(String rolloverTarget, String newIndexName) {
         this.rolloverTarget = rolloverTarget;
@@ -174,7 +176,7 @@ public void writeTo(StreamOutput out) throws IOException {
 
     @Override
     public String[] indices() {
-        return new String[] { rolloverTarget };
+        return new String[]{rolloverTarget};
     }
 
     @Override
@@ -263,33 +265,33 @@ public void addMaxPrimaryShardSizeCondition(ByteSizeValue size) {
      * Adds required condition to check if the index is at least <code>age</code> old
      */
     public void addMinIndexAgeCondition(TimeValue age) {
-        MaxAgeCondition maxAgeCondition = new MaxAgeCondition(age);
-        if (this.conditions.containsKey(maxAgeCondition.name)) {
-            throw new IllegalArgumentException(maxAgeCondition.name + " condition is already set");
+        MinAgeCondition minAgeCondition = new MinAgeCondition(age);
+        if (this.conditions.containsKey(minAgeCondition.name)) {
+            throw new IllegalArgumentException(minAgeCondition.name + " condition is already set");
         }
-        this.conditions.put(maxAgeCondition.name, maxAgeCondition);
+        this.conditions.put(minAgeCondition.name, minAgeCondition);
     }
 
     /**
      * Adds required condition to check if the index has at least <code>numDocs</code>
      */
     public void addMinIndexDocsCondition(long numDocs) {
-        MaxDocsCondition maxDocsCondition = new MaxDocsCondition(numDocs);
-        if (this.conditions.containsKey(maxDocsCondition.name)) {
-            throw new IllegalArgumentException(maxDocsCondition.name + " condition is already set");
+        MinDocsCondition minDocsCondition = new MinDocsCondition(numDocs);
+        if (this.conditions.containsKey(minDocsCondition.name)) {
+            throw new IllegalArgumentException(minDocsCondition.name + " condition is already set");
         }
-        this.conditions.put(maxDocsCondition.name, maxDocsCondition);
+        this.conditions.put(minDocsCondition.name, minDocsCondition);
     }
 
     /**
      * Adds a size-based required condition to check if the size of the largest primary shard is at least <code>size</code>.
      */
     public void addMinPrimaryShardSizeCondition(ByteSizeValue size) {
-        MaxPrimaryShardSizeCondition maxPrimaryShardSizeCondition = new MaxPrimaryShardSizeCondition(size);
-        if (this.conditions.containsKey(maxPrimaryShardSizeCondition.name)) {
-            throw new IllegalArgumentException(maxPrimaryShardSizeCondition + " condition is already set");
+        MinPrimaryShardSizeCondition minPrimaryShardSizeCondition = new MinPrimaryShardSizeCondition(size);
+        if (this.conditions.containsKey(minPrimaryShardSizeCondition.name)) {
+            throw new IllegalArgumentException(minPrimaryShardSizeCondition + " condition is already set");
         }
-        this.conditions.put(maxPrimaryShardSizeCondition.name, maxPrimaryShardSizeCondition);
+        this.conditions.put(minPrimaryShardSizeCondition.name, minPrimaryShardSizeCondition);
     }
 
     public boolean isDryRun() {
@@ -308,6 +310,19 @@ public String getNewIndexName() {
         return newIndexName;
     }
 
+    public boolean areConditionsMet(Map<String, Boolean> trialConditionResults) {
+        Collection<Condition<?>> conditions = getConditions().values();
+        boolean allRequiredMet = conditions.stream()
+            .filter(Condition::isRequired)
+            .allMatch(c -> trialConditionResults.get(c.toString()));
+
+        boolean anyNonRequiredMet = conditions.stream()
+            .filter(Predicate.not(Condition::isRequired))
+            .anyMatch(c -> trialConditionResults.get(c.toString()));
+
+        return trialConditionResults.size() == 0 || (allRequiredMet && anyNonRequiredMet);
+    }
+
     /**
      * Returns the inner {@link CreateIndexRequest}. Allows to configure mappings, settings and aliases for the new index.
      */

server/src/main/java/org/elasticsearch/action/admin/indices/rollover/TransportRolloverAction.java

@@ -153,38 +153,24 @@ protected void masterOperation(
                     buildStats(metadata.index(trialSourceIndexName), statsResponse)
                 );
 
-                // If this is a dry run, return with the results without invoking a cluster state update
-                if (rolloverRequest.isDryRun()) {
-                    listener.onResponse(
-                        new RolloverResponse(trialSourceIndexName, trialRolloverIndexName, trialConditionResults, true, false, false, false)
-                    );
-                    return;
-                }
-
-                boolean allRequiredMet = rolloverRequest.getConditions()
-                    .values()
-                    .stream()
-                    .filter(Condition::isRequired)
-                    .allMatch(c -> trialConditionResults.get(c.toString()));
-
-                boolean anyNonRequiredMet = rolloverRequest.getConditions()
-                    .values()
-                    .stream()
-                    .filter(Predicate.not(Condition::isRequired))
-                    .anyMatch(c -> trialConditionResults.get(c.toString()));
-
                 final RolloverResponse trialRolloverResponse = new RolloverResponse(
                     trialSourceIndexName,
                     trialRolloverIndexName,
                     trialConditionResults,
-                    false,
+                    rolloverRequest.isDryRun(),
                     false,
                     false,
                     false
                 );
 
+                // If this is a dry run, return with the results without invoking a cluster state update
+                if (rolloverRequest.isDryRun()) {
+                    listener.onResponse(trialRolloverResponse);
+                    return;
+                }
+
                 // Pre-check the conditions to see whether we should submit a new cluster state task
-                if (trialConditionResults.size() == 0 || (allRequiredMet && anyNonRequiredMet)) {
+                if (rolloverRequest.areConditionsMet(trialConditionResults)) {
                     String source = "rollover_index source [" + trialRolloverIndexName + "] to target [" + trialRolloverIndexName + "]";
                     RolloverTask rolloverTask = new RolloverTask(rolloverRequest, statsResponse, trialRolloverResponse, listener);
                     ClusterStateTaskConfig config = ClusterStateTaskConfig.build(Priority.NORMAL, rolloverRequest.masterNodeTimeout());
@@ -197,6 +183,22 @@ protected void masterOperation(
         );
     }
 
+    private boolean areConditionsMet(RolloverRequest rolloverRequest, Map<String, Boolean> trialConditionResults) {
+        boolean allRequiredMet = rolloverRequest.getConditions()
+            .values()
+            .stream()
+            .filter(Condition::isRequired)
+            .allMatch(c -> trialConditionResults.get(c.toString()));
+
+        boolean anyNonRequiredMet = rolloverRequest.getConditions()
+            .values()
+            .stream()
+            .filter(Predicate.not(Condition::isRequired))
+            .anyMatch(c -> trialConditionResults.get(c.toString()));
+
+        return trialConditionResults.size() == 0 || (allRequiredMet && anyNonRequiredMet);
+    }
+
     static Map<String, Boolean> evaluateConditions(final Collection<Condition<?>> conditions, @Nullable final Condition.Stats stats) {
         Objects.requireNonNull(conditions, "conditions must not be null");
 
@@ -337,7 +339,7 @@ public void clusterStateProcessed(String source, ClusterState oldState, ClusterS
                 assert conditionResults.get() != null : "matching rollover conditions missing on successful rollover";
 
                 activeShardsObserver.waitForActiveShards(
-                    new String[] { rolloverIndex.get() },
+                    new String[]{rolloverIndex.get()},
                     rolloverRequest.getCreateIndexRequest().waitForActiveShards(),
                     rolloverRequest.masterNodeTimeout(),
                     isShardsAcknowledged -> listener.onResponse(

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/RolloverAction.java

@@ -137,7 +137,7 @@ public RolloverAction(StreamInput in) throws IOException {
         }
         maxAge = in.readOptionalTimeValue();
         maxDocs = in.readOptionalVLong();
-        if (in.getVersion().after(Version.V_8_1_0)) {
+        if (in.getVersion().onOrAfter(Version.V_8_1_0)) {
             if (in.readBoolean()) {
                 minPrimaryShardSize = new ByteSizeValue(in);
             } else {
@@ -166,7 +166,7 @@ public void writeTo(StreamOutput out) throws IOException {
         }
         out.writeOptionalTimeValue(maxAge);
         out.writeOptionalVLong(maxDocs);
-        if (out.getVersion().after(Version.V_8_1_0)) {
+        if (out.getVersion().onOrAfter(Version.V_8_1_0)) {
             out.writeBoolean(minPrimaryShardSize != null);
             if (minPrimaryShardSize != null) {
                 minPrimaryShardSize.writeTo(out);
@@ -257,7 +257,10 @@ public List<Step> toSteps(Client client, String phase, Step.StepKey nextStepKey)
             maxSize,
             maxPrimaryShardSize,
             maxAge,
-            maxDocs
+            maxDocs,
+            minPrimaryShardSize,
+            minAge,
+            minDocs
         );
         RolloverStep rolloverStep = new RolloverStep(rolloverStepKey, waitForActiveShardsKey, client);
         WaitForActiveShardsStep waitForActiveShardsStep = new WaitForActiveShardsStep(waitForActiveShardsKey, updateDateStepKey);
@@ -277,7 +280,7 @@ public List<Step> toSteps(Client client, String phase, Step.StepKey nextStepKey)
 
     @Override
     public int hashCode() {
-        return Objects.hash(maxSize, maxPrimaryShardSize, maxAge, maxDocs);
+        return Objects.hash(maxSize, maxPrimaryShardSize, maxAge, maxDocs, minPrimaryShardSize, minAge, minDocs);
     }
 
     @Override
@@ -292,7 +295,10 @@ public boolean equals(Object obj) {
         return Objects.equals(maxSize, other.maxSize)
             && Objects.equals(maxPrimaryShardSize, other.maxPrimaryShardSize)
             && Objects.equals(maxAge, other.maxAge)
-            && Objects.equals(maxDocs, other.maxDocs);
+            && Objects.equals(maxDocs, other.maxDocs)
+            && Objects.equals(minPrimaryShardSize, other.minPrimaryShardSize)
+            && Objects.equals(minAge, other.minAge)
+            && Objects.equals(minDocs, other.minDocs);
     }
 
     @Override

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/WaitForRolloverReadyStep.java

@@ -215,7 +215,7 @@ public void evaluateCondition(Metadata metadata, Index index, Listener listener,
             .rolloverIndex(
                 rolloverRequest,
                 ActionListener.wrap(
-                    response -> listener.onResponse(response.getConditionStatus().values().stream().anyMatch(i -> i), EmptyInfo.INSTANCE),
+                    response -> listener.onResponse(rolloverRequest.areConditionsMet(response.getConditionStatus()), EmptyInfo.INSTANCE),
                     listener::onFailure
                 )
             );
@@ -237,9 +237,21 @@ Long getMaxDocs() {
         return maxDocs;
     }
 
+    ByteSizeValue getMinPrimaryShardSize() {
+        return minPrimaryShardSize;
+    }
+
+    TimeValue getMinAge() {
+        return minAge;
+    }
+
+    Long getMinDocs() {
+        return minDocs;
+    }
+
     @Override
     public int hashCode() {
-        return Objects.hash(super.hashCode(), maxSize, maxPrimaryShardSize, maxAge, maxDocs);
+        return Objects.hash(super.hashCode(), maxSize, maxPrimaryShardSize, maxAge, maxDocs, minPrimaryShardSize, minAge, minDocs);
     }
 
     @Override
@@ -255,7 +267,10 @@ public boolean equals(Object obj) {
             && Objects.equals(maxSize, other.maxSize)
             && Objects.equals(maxPrimaryShardSize, other.maxPrimaryShardSize)
             && Objects.equals(maxAge, other.maxAge)
-            && Objects.equals(maxDocs, other.maxDocs);
+            && Objects.equals(maxDocs, other.maxDocs)
+            && Objects.equals(minPrimaryShardSize, other.minPrimaryShardSize)
+            && Objects.equals(minAge, other.minAge)
+            && Objects.equals(minDocs, other.minDocs);
     }
 
     // We currently have no information to provide for this AsyncWaitStep, so this is an empty object

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ilm/PhaseCacheManagementTests.java

@@ -81,7 +81,7 @@ public void testRefreshPhaseJson() throws IOException {
         String indexName = meta.getIndex().getName();
 
         Map<String, LifecycleAction> actions = new HashMap<>();
-        actions.put("rollover", new RolloverAction(null, null, null, 1L));
+        actions.put("rollover", new RolloverAction(null, null, null, 1L, null, null, null));
         actions.put("set_priority", new SetPriorityAction(100));
         Phase hotPhase = new Phase("hot", TimeValue.ZERO, actions);
         Map<String, Phase> phases = Collections.singletonMap("hot", hotPhase);
@@ -316,7 +316,7 @@ public void testIndexCanBeSafelyUpdated() {
             IndexMetadata meta = mkMeta().putCustom(ILM_CUSTOM_METADATA_KEY, exState.asMap()).build();
 
             Map<String, LifecycleAction> actions = new HashMap<>();
-            actions.put("rollover", new RolloverAction(null, null, null, 1L));
+            actions.put("rollover", new RolloverAction(null, null, null, 1L, null, null, null));
             actions.put("set_priority", new SetPriorityAction(100));
             Phase hotPhase = new Phase("hot", TimeValue.ZERO, actions);
             Map<String, Phase> phases = Collections.singletonMap("hot", hotPhase);
@@ -389,7 +389,7 @@ public void testIndexCanBeSafelyUpdated() {
             IndexMetadata meta = mkMeta().putCustom(ILM_CUSTOM_METADATA_KEY, exState.asMap()).build();
 
             Map<String, LifecycleAction> actions = new HashMap<>();
-            actions.put("rollover", new RolloverAction(null, null, TimeValue.timeValueSeconds(5), null));
+            actions.put("rollover", new RolloverAction(null, null, TimeValue.timeValueSeconds(5), null, null, null, null));
             Phase hotPhase = new Phase("hot", TimeValue.ZERO, actions);
             Map<String, Phase> phases = Collections.singletonMap("hot", hotPhase);
             LifecyclePolicy newPolicy = new LifecyclePolicy("my-policy", phases);
@@ -420,7 +420,7 @@ public void testIndexCanBeSafelyUpdated() {
             IndexMetadata meta = mkMeta().putCustom(ILM_CUSTOM_METADATA_KEY, exState.asMap()).build();
 
             Map<String, LifecycleAction> actions = new HashMap<>();
-            actions.put("rollover", new RolloverAction(null, null, null, 1L));
+            actions.put("rollover", new RolloverAction(null, null, null, 1L, null, null, null));
             actions.put("set_priority", new SetPriorityAction(100));
             Phase hotPhase = new Phase("hot", TimeValue.ZERO, actions);
             Map<String, Phase> phases = Collections.singletonMap("hot", hotPhase);
@@ -441,7 +441,7 @@ public void testIndexCanBeSafelyUpdated() {
             IndexMetadata meta = mkMeta().putCustom(ILM_CUSTOM_METADATA_KEY, exState.asMap()).build();
 
             Map<String, LifecycleAction> actions = new HashMap<>();
-            actions.put("rollover", new RolloverAction(null, null, null, 1L));
+            actions.put("rollover", new RolloverAction(null, null, null, 1L, null, null, null));
             actions.put("set_priority", new SetPriorityAction(100));
             Phase hotPhase = new Phase("hot", TimeValue.ZERO, actions);
             Map<String, Phase> phases = Collections.singletonMap("hot", hotPhase);
@@ -480,14 +480,14 @@ public void testUpdateIndicesForPolicy() throws IOException {
         assertTrue(eligibleToCheckForRefresh(meta));
 
         Map<String, LifecycleAction> oldActions = new HashMap<>();
-        oldActions.put("rollover", new RolloverAction(null, null, null, 1L));
+        oldActions.put("rollover", new RolloverAction(null, null, null, 1L, null, null, null));
         oldActions.put("set_priority", new SetPriorityAction(100));
         Phase oldHotPhase = new Phase("hot", TimeValue.ZERO, oldActions);
         Map<String, Phase> oldPhases = Collections.singletonMap("hot", oldHotPhase);
         LifecyclePolicy oldPolicy = new LifecyclePolicy("my-policy", oldPhases);
 
         Map<String, LifecycleAction> actions = new HashMap<>();
-        actions.put("rollover", new RolloverAction(null, null, null, 1L));
+        actions.put("rollover", new RolloverAction(null, null, null, 1L, null, null, null));
         actions.put("set_priority", new SetPriorityAction(100));
         Phase hotPhase = new Phase("hot", TimeValue.ZERO, actions);
         Map<String, Phase> phases = Collections.singletonMap("hot", hotPhase);
@@ -507,7 +507,7 @@ public void testUpdateIndicesForPolicy() throws IOException {
         assertThat(updatedState, equalTo(existingState));
 
         actions = new HashMap<>();
-        actions.put("rollover", new RolloverAction(null, null, null, 2L));
+        actions.put("rollover", new RolloverAction(null, null, null, 2L, null, null, null));
         actions.put("set_priority", new SetPriorityAction(150));
         hotPhase = new Phase("hot", TimeValue.ZERO, actions);
         phases = Collections.singletonMap("hot", hotPhase);