Only run ILM periodically

Author: nielsbauman

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

@@ -36,7 +36,7 @@ public class LifecycleSettings {
 
     public static final Setting<TimeValue> LIFECYCLE_POLL_INTERVAL_SETTING = Setting.timeSetting(
         LIFECYCLE_POLL_INTERVAL,
-        TimeValue.timeValueMinutes(10),
+        TimeValue.timeValueSeconds(10),
         TimeValue.timeValueSeconds(1),
         Setting.Property.Dynamic,
         Setting.Property.NodeScope

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

@@ -324,8 +324,6 @@ public void clusterChanged(ClusterChangedEvent event) {
                     }
                 });
             }
-
-            triggerPolicies(event.state(), true);
         }
     }
 
@@ -354,6 +352,7 @@ private void cancelJob() {
     public void triggered(SchedulerEngine.Event event) {
         if (event.jobName().equals(XPackField.INDEX_LIFECYCLE)) {
             logger.trace("job triggered: {}, {}, {}", event.jobName(), event.scheduledTime(), event.triggeredTime());
+            triggerPolicies(clusterService.state(), true);
             triggerPolicies(clusterService.state(), false);
         }
     }