Skip to content

Commit 05e4282

Browse files
talevytalevy
committed
clean up
1 parent bdf9f29 commit 05e4282

File tree

10 files changed

+62
-60
lines changed

10 files changed

+62
-60
lines changed

‎x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/indexlifecycle/IndexLifecycleMetadata.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public class IndexLifecycleMetadata implements MetaData.Custom {
3939
public static final ConstructingObjectParser<IndexLifecycleMetadata, Void> PARSER = new ConstructingObjectParser<>(
4040
TYPE, a -> new IndexLifecycleMetadata(
4141
ObjectParserUtils.convertListToMapValues(LifecyclePolicyMetadata::getName, (List<LifecyclePolicyMetadata>) a[0]),
42-
MaintenanceMode.valueOf((String) a[1])));
42+
OperationMode.valueOf((String) a[1])));
4343
static {
4444
PARSER.declareNamedObjects(ConstructingObjectParser.constructorArg(), (p, c, n) -> LifecyclePolicyMetadata.parse(p, n),
4545
v -> {
@@ -49,9 +49,9 @@ public class IndexLifecycleMetadata implements MetaData.Custom {
4949
}
5050

5151
private final Map<String, LifecyclePolicyMetadata> policyMetadatas;
52-
private final MaintenanceMode maintenanceMode;
52+
private final OperationMode maintenanceMode;
5353

54-
public IndexLifecycleMetadata(Map<String, LifecyclePolicyMetadata> policies, MaintenanceMode maintenanceMode) {
54+
public IndexLifecycleMetadata(Map<String, LifecyclePolicyMetadata> policies, OperationMode maintenanceMode) {
5555
this.policyMetadatas = Collections.unmodifiableMap(policies);
5656
this.maintenanceMode = maintenanceMode;
5757
}
@@ -63,7 +63,7 @@ public IndexLifecycleMetadata(StreamInput in) throws IOException {
6363
policies.put(in.readString(), new LifecyclePolicyMetadata(in));
6464
}
6565
this.policyMetadatas = policies;
66-
this.maintenanceMode = in.readEnum(MaintenanceMode.class);
66+
this.maintenanceMode = in.readEnum(OperationMode.class);
6767
}
6868

6969
@Override
@@ -80,7 +80,7 @@ public Map<String, LifecyclePolicyMetadata> getPolicyMetadatas() {
8080
return policyMetadatas;
8181
}
8282

83-
public MaintenanceMode getMaintenanceMode() {
83+
public OperationMode getMaintenanceMode() {
8484
return maintenanceMode;
8585
}
8686

@@ -142,7 +142,7 @@ public String toString() {
142142
public static class IndexLifecycleMetadataDiff implements NamedDiff<MetaData.Custom> {
143143

144144
final Diff<Map<String, LifecyclePolicyMetadata>> policies;
145-
final MaintenanceMode maintenanceMode;
145+
final OperationMode maintenanceMode;
146146

147147
IndexLifecycleMetadataDiff(IndexLifecycleMetadata before, IndexLifecycleMetadata after) {
148148
this.policies = DiffableUtils.diff(before.policyMetadatas, after.policyMetadatas, DiffableUtils.getStringKeySerializer());
@@ -152,14 +152,14 @@ public static class IndexLifecycleMetadataDiff implements NamedDiff<MetaData.Cus
152152
public IndexLifecycleMetadataDiff(StreamInput in) throws IOException {
153153
this.policies = DiffableUtils.readJdkMapDiff(in, DiffableUtils.getStringKeySerializer(), LifecyclePolicyMetadata::new,
154154
IndexLifecycleMetadataDiff::readLifecyclePolicyDiffFrom);
155-
this.maintenanceMode = in.readEnum(MaintenanceMode.class);
155+
this.maintenanceMode = in.readEnum(OperationMode.class);
156156
}
157157

158158
@Override
159159
public MetaData.Custom apply(MetaData.Custom part) {
160160
TreeMap<String, LifecyclePolicyMetadata> newPolicies = new TreeMap<>(
161161
policies.apply(((IndexLifecycleMetadata) part).policyMetadatas));
162-
return new IndexLifecycleMetadata(newPolicies, ((IndexLifecycleMetadata) part).maintenanceMode);
162+
return new IndexLifecycleMetadata(newPolicies, this.maintenanceMode);
163163
}
164164

165165
@Override

‎x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/indexlifecycle/MaintenanceMode.java‎ renamed to ‎x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/indexlifecycle/OperationMode.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
*/
66
package org.elasticsearch.xpack.core.indexlifecycle;
77

8-
public enum MaintenanceMode {
9-
REQUESTED, IN, OUT
8+
public enum OperationMode {
9+
MAINTENANCE_REQUESTED, MAINTENANCE, NORMAL
1010
}

‎x-pack/plugin/index-lifecycle/src/main/java/org/elasticsearch/xpack/indexlifecycle/IndexLifecycleService.java‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.elasticsearch.xpack.core.indexlifecycle.IndexLifecycleMetadata;
2626
import org.elasticsearch.xpack.core.indexlifecycle.LifecyclePolicy;
2727
import org.elasticsearch.xpack.core.indexlifecycle.LifecycleSettings;
28-
import org.elasticsearch.xpack.core.indexlifecycle.MaintenanceMode;
28+
import org.elasticsearch.xpack.core.indexlifecycle.OperationMode;
2929
import org.elasticsearch.xpack.core.indexlifecycle.ShrinkAction;
3030
import org.elasticsearch.xpack.core.indexlifecycle.Step.StepKey;
3131
import org.elasticsearch.xpack.core.scheduler.SchedulerEngine;
@@ -39,8 +39,7 @@
3939
/**
4040
* A service which runs the {@link LifecyclePolicy}s associated with indexes.
4141
*/
42-
public class IndexLifecycleService extends AbstractComponent implements ClusterStateListener,
43-
SchedulerEngine.Listener, Closeable, MaintenanceModeUpdateTask.Listener {
42+
public class IndexLifecycleService extends AbstractComponent implements ClusterStateListener, SchedulerEngine.Listener, Closeable {
4443
private static final Logger logger = ESLoggerFactory.getLogger(IndexLifecycleService.class);
4544
private static final Set<String> IGNORE_ACTIONS_MAINTENANCE_REQUESTED = Collections.singleton(ShrinkAction.NAME);
4645

@@ -110,7 +109,7 @@ public void clusterChanged(ClusterChangedEvent event) {
110109
}
111110

112111
if (lifecycleMetadata == null) { // no lifecycle metadata, install initial empty metadata state
113-
lifecycleMetadata = new IndexLifecycleMetadata(Collections.emptySortedMap(), MaintenanceMode.OUT);
112+
lifecycleMetadata = new IndexLifecycleMetadata(Collections.emptySortedMap(), OperationMode.NORMAL);
114113
installMetadata(lifecycleMetadata);
115114
} else if (scheduler.get() == null) { // metadata installed and scheduler should be kicked off. start your engines.
116115
scheduler.set(new SchedulerEngine(clock));
@@ -122,7 +121,7 @@ public void clusterChanged(ClusterChangedEvent event) {
122121
scheduleJob(pollInterval);
123122
}
124123

125-
triggerPolicies(event.state(), true, this);
124+
triggerPolicies(event.state(), true);
126125
} else {
127126
cancelJob();
128127
}
@@ -144,7 +143,7 @@ private void scheduleJob(TimeValue pollInterval) {
144143
public void triggered(SchedulerEngine.Event event) {
145144
if (event.getJobName().equals(IndexLifecycle.NAME)) {
146145
logger.debug("Job triggered: " + event.getJobName() + ", " + event.getScheduledTime() + ", " + event.getTriggeredTime());
147-
triggerPolicies(clusterService.state(), false, this);
146+
triggerPolicies(clusterService.state(), false);
148147
}
149148
}
150149

@@ -167,12 +166,20 @@ public void onFailure(String source, Exception e) {
167166
}));
168167
}
169168

170-
public void triggerPolicies(ClusterState clusterState, boolean fromClusterStateChange,
171-
MaintenanceModeUpdateTask.Listener listener) {
169+
/**
170+
* executes the policy execution on the appropriate indices by running cluster-state tasks per index.
171+
*
172+
* If maintenance-mode was requested, and it is safe to move into maintenance-mode, this will also be done here
173+
* when possible after no policies are executed.
174+
*
175+
* @param clusterState the current cluster state
176+
* @param fromClusterStateChange whether things are triggered from the cluster-state-listener or the scheduler
177+
*/
178+
public void triggerPolicies(ClusterState clusterState, boolean fromClusterStateChange) {
172179
IndexLifecycleMetadata currentMetadata = clusterState.metaData().custom(IndexLifecycleMetadata.TYPE);
173-
MaintenanceMode currentMode = currentMetadata == null ? MaintenanceMode.OUT : currentMetadata.getMaintenanceMode();
180+
OperationMode currentMode = currentMetadata == null ? OperationMode.NORMAL : currentMetadata.getMaintenanceMode();
174181

175-
if (MaintenanceMode.IN.equals(currentMode)) {
182+
if (OperationMode.MAINTENANCE.equals(currentMode)) {
176183
return;
177184
}
178185

@@ -186,16 +193,16 @@ public void triggerPolicies(ClusterState clusterState, boolean fromClusterStateC
186193
String policyName = LifecycleSettings.LIFECYCLE_NAME_SETTING.get(idxMeta.getSettings());
187194
if (Strings.isNullOrEmpty(policyName) == false) {
188195
StepKey stepKey = IndexLifecycleRunner.getCurrentStepKey(idxMeta.getSettings());
189-
if (MaintenanceMode.REQUESTED.equals(currentMode)
196+
if (OperationMode.MAINTENANCE_REQUESTED.equals(currentMode)
190197
&& IGNORE_ACTIONS_MAINTENANCE_REQUESTED.contains(stepKey.getAction()) == false) {
191198
continue;
192199
}
193200
lifecycleRunner.runPolicy(policyName, idxMeta, clusterState, fromClusterStateChange);
194201
safeToEnterMaintenanceMode = false; // proven false!
195202
}
196203
}
197-
if (safeToEnterMaintenanceMode && MaintenanceMode.REQUESTED.equals(currentMode)) {
198-
listener.onSafeToEnterMaintenanceMode();
204+
if (safeToEnterMaintenanceMode && OperationMode.MAINTENANCE_REQUESTED.equals(currentMode)) {
205+
submitMaintenanceModeUpdate(OperationMode.MAINTENANCE);
199206
}
200207
}
201208

@@ -207,13 +214,8 @@ public void close() {
207214
}
208215
}
209216

210-
public void submitMaintenanceModeUpdate(MaintenanceMode mode) {
217+
public void submitMaintenanceModeUpdate(OperationMode mode) {
211218
clusterService.submitStateUpdateTask("ilm_maintenance_update",
212219
new MaintenanceModeUpdateTask(mode));
213220
}
214-
215-
@Override
216-
public void onSafeToEnterMaintenanceMode() {
217-
submitMaintenanceModeUpdate(MaintenanceMode.IN);
218-
}
219221
}

‎x-pack/plugin/index-lifecycle/src/main/java/org/elasticsearch/xpack/indexlifecycle/MaintenanceModeUpdateTask.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
import org.elasticsearch.cluster.metadata.MetaData;
1212
import org.elasticsearch.common.logging.ESLoggerFactory;
1313
import org.elasticsearch.xpack.core.indexlifecycle.IndexLifecycleMetadata;
14-
import org.elasticsearch.xpack.core.indexlifecycle.MaintenanceMode;
14+
import org.elasticsearch.xpack.core.indexlifecycle.OperationMode;
1515

1616
public class MaintenanceModeUpdateTask extends ClusterStateUpdateTask {
1717
private static final Logger logger = ESLoggerFactory.getLogger(MaintenanceModeUpdateTask.class);
18-
private final MaintenanceMode mode;
18+
private final OperationMode mode;
1919

20-
public MaintenanceModeUpdateTask(MaintenanceMode mode) {
20+
public MaintenanceModeUpdateTask(OperationMode mode) {
2121
this.mode = mode;
2222
}
2323

@@ -26,8 +26,8 @@ public ClusterState execute(ClusterState currentState) {
2626
IndexLifecycleMetadata currentMetadata = currentState.metaData().custom(IndexLifecycleMetadata.TYPE);
2727

2828
boolean maintenanceModeToChange = currentMetadata.getMaintenanceMode().equals(mode) == false;
29-
boolean maintenanceModeRequested = MaintenanceMode.REQUESTED.equals(mode);
30-
boolean inMaintenanceMode = MaintenanceMode.IN.equals(currentMetadata.getMaintenanceMode());
29+
boolean maintenanceModeRequested = OperationMode.MAINTENANCE_REQUESTED.equals(mode);
30+
boolean inMaintenanceMode = OperationMode.IN.equals(currentMetadata.getMaintenanceMode());
3131
if ((inMaintenanceMode && maintenanceModeRequested) || maintenanceModeToChange == false) {
3232
return currentState;
3333
}

‎x-pack/plugin/index-lifecycle/src/main/java/org/elasticsearch/xpack/indexlifecycle/action/TransportPutLifecycleAction.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.elasticsearch.xpack.core.ClientHelper;
2424
import org.elasticsearch.xpack.core.indexlifecycle.IndexLifecycleMetadata;
2525
import org.elasticsearch.xpack.core.indexlifecycle.LifecyclePolicyMetadata;
26-
import org.elasticsearch.xpack.core.indexlifecycle.MaintenanceMode;
26+
import org.elasticsearch.xpack.core.indexlifecycle.OperationMode;
2727
import org.elasticsearch.xpack.core.indexlifecycle.action.PutLifecycleAction;
2828
import org.elasticsearch.xpack.core.indexlifecycle.action.PutLifecycleAction.Request;
2929
import org.elasticsearch.xpack.core.indexlifecycle.action.PutLifecycleAction.Response;
@@ -76,7 +76,7 @@ public ClusterState execute(ClusterState currentState) throws Exception {
7676
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
7777
LifecyclePolicyMetadata lifecyclePolicyMetadata = new LifecyclePolicyMetadata(request.getPolicy(), filteredHeaders);
7878
newPolicies.put(lifecyclePolicyMetadata.getName(), lifecyclePolicyMetadata);
79-
IndexLifecycleMetadata newMetadata = new IndexLifecycleMetadata(newPolicies, MaintenanceMode.OUT);
79+
IndexLifecycleMetadata newMetadata = new IndexLifecycleMetadata(newPolicies, OperationMode.OUT);
8080
newState.metaData(MetaData.builder(currentState.getMetaData())
8181
.putCustom(IndexLifecycleMetadata.TYPE, newMetadata).build());
8282
return newState.build();

‎x-pack/plugin/index-lifecycle/src/test/java/org/elasticsearch/xpack/indexlifecycle/ExecuteStepsUpdateTaskTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.elasticsearch.xpack.core.indexlifecycle.LifecyclePolicy;
2525
import org.elasticsearch.xpack.core.indexlifecycle.LifecyclePolicyMetadata;
2626
import org.elasticsearch.xpack.core.indexlifecycle.LifecycleSettings;
27-
import org.elasticsearch.xpack.core.indexlifecycle.MaintenanceMode;
27+
import org.elasticsearch.xpack.core.indexlifecycle.OperationMode;
2828
import org.elasticsearch.xpack.core.indexlifecycle.MockAction;
2929
import org.elasticsearch.xpack.core.indexlifecycle.MockStep;
3030
import org.elasticsearch.xpack.core.indexlifecycle.Phase;
@@ -99,7 +99,7 @@ public void prepareState() {
9999

100100
MetaData metaData = MetaData.builder()
101101
.persistentSettings(settings(Version.CURRENT).build())
102-
.putCustom(IndexLifecycleMetadata.TYPE, new IndexLifecycleMetadata(policyMap, MaintenanceMode.OUT))
102+
.putCustom(IndexLifecycleMetadata.TYPE, new IndexLifecycleMetadata(policyMap, OperationMode.OUT))
103103
.put(IndexMetaData.builder(indexMetadata))
104104
.build();
105105
String nodeId = randomAlphaOfLength(10);

‎x-pack/plugin/index-lifecycle/src/test/java/org/elasticsearch/xpack/indexlifecycle/IndexLifecycleMetadataTests.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.elasticsearch.xpack.core.indexlifecycle.LifecyclePolicy;
2525
import org.elasticsearch.xpack.core.indexlifecycle.LifecyclePolicyMetadata;
2626
import org.elasticsearch.xpack.core.indexlifecycle.LifecycleType;
27-
import org.elasticsearch.xpack.core.indexlifecycle.MaintenanceMode;
27+
import org.elasticsearch.xpack.core.indexlifecycle.OperationMode;
2828
import org.elasticsearch.xpack.core.indexlifecycle.Phase;
2929
import org.elasticsearch.xpack.core.indexlifecycle.TestLifecycleType;
3030

@@ -60,7 +60,7 @@ protected IndexLifecycleMetadata createTestInstance() {
6060
policies.put(policyName, new LifecyclePolicyMetadata(new LifecyclePolicy(TestLifecycleType.INSTANCE, policyName, phases),
6161
Collections.emptyMap()));
6262
}
63-
return new IndexLifecycleMetadata(policies, randomFrom(MaintenanceMode.values()));
63+
return new IndexLifecycleMetadata(policies, randomFrom(OperationMode.values()));
6464
}
6565

6666
@Override
@@ -94,13 +94,13 @@ protected MetaData.Custom mutateInstance(MetaData.Custom instance) {
9494
IndexLifecycleMetadata metadata = (IndexLifecycleMetadata) instance;
9595
Map<String, LifecyclePolicyMetadata> policies = metadata.getPolicyMetadatas();
9696
policies = new TreeMap<>(policies);
97-
MaintenanceMode mode = metadata.getMaintenanceMode();
97+
OperationMode mode = metadata.getMaintenanceMode();
9898
if (randomBoolean()) {
9999
String policyName = randomAlphaOfLength(10);
100100
policies.put(policyName, new LifecyclePolicyMetadata(
101101
new LifecyclePolicy(TestLifecycleType.INSTANCE, policyName, Collections.emptyMap()), Collections.emptyMap()));
102102
} else {
103-
mode = randomValueOtherThan(metadata.getMaintenanceMode(), () -> randomFrom(MaintenanceMode.values()));
103+
mode = randomValueOtherThan(metadata.getMaintenanceMode(), () -> randomFrom(OperationMode.values()));
104104
}
105105
return new IndexLifecycleMetadata(policies, mode);
106106
}

‎x-pack/plugin/index-lifecycle/src/test/java/org/elasticsearch/xpack/indexlifecycle/IndexLifecycleServiceTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.elasticsearch.threadpool.ThreadPool;
2626
import org.elasticsearch.xpack.core.indexlifecycle.IndexLifecycleMetadata;
2727
import org.elasticsearch.xpack.core.indexlifecycle.LifecycleSettings;
28-
import org.elasticsearch.xpack.core.indexlifecycle.MaintenanceMode;
28+
import org.elasticsearch.xpack.core.indexlifecycle.OperationMode;
2929
import org.elasticsearch.xpack.core.scheduler.SchedulerEngine;
3030
import org.junit.After;
3131
import org.junit.Before;
@@ -110,7 +110,7 @@ public void testElectUnElectMaster() throws Exception {
110110
MetaData metaData = MetaData.builder()
111111
.persistentSettings(settings(Version.CURRENT)
112112
.put(LifecycleSettings.LIFECYCLE_POLL_INTERVAL_SETTING.getKey(), TimeValue.timeValueSeconds(3)).build())
113-
.putCustom(IndexLifecycleMetadata.TYPE, new IndexLifecycleMetadata(Collections.emptySortedMap(), MaintenanceMode.OUT))
113+
.putCustom(IndexLifecycleMetadata.TYPE, new IndexLifecycleMetadata(Collections.emptySortedMap(), OperationMode.OUT))
114114
.build();
115115

116116
// First check that when the node has never been master the scheduler
@@ -205,7 +205,7 @@ public void cleanup() throws IOException {
205205
public void testSchedulerInitializationAndUpdate() {
206206
TimeValue pollInterval = TimeValue.timeValueSeconds(randomIntBetween(1, 59));
207207
MetaData metaData = MetaData.builder()
208-
.putCustom(IndexLifecycleMetadata.TYPE, new IndexLifecycleMetadata(Collections.emptySortedMap(), MaintenanceMode.OUT))
208+
.putCustom(IndexLifecycleMetadata.TYPE, new IndexLifecycleMetadata(Collections.emptySortedMap(), OperationMode.OUT))
209209
.persistentSettings(settings(Version.CURRENT).build())
210210
.build();
211211
MetaData updatedPollMetaData = MetaData.builder(metaData).persistentSettings(settings(Version.CURRENT)

‎x-pack/plugin/index-lifecycle/src/test/java/org/elasticsearch/xpack/indexlifecycle/MaintenanceModeUpdateTaskTests.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import org.elasticsearch.common.collect.ImmutableOpenMap;
1313
import org.elasticsearch.test.ESTestCase;
1414
import org.elasticsearch.xpack.core.indexlifecycle.IndexLifecycleMetadata;
15-
import org.elasticsearch.xpack.core.indexlifecycle.MaintenanceMode;
15+
import org.elasticsearch.xpack.core.indexlifecycle.OperationMode;
1616

1717
import java.util.Collections;
1818

@@ -22,29 +22,29 @@ public class MaintenanceModeUpdateTaskTests extends ESTestCase {
2222

2323
public void testExecute() {
2424
// assert can change out of OUT
25-
MaintenanceMode currentMode = MaintenanceMode.OUT;
26-
MaintenanceMode requestedMode = randomValueOtherThan(currentMode, () -> randomFrom(MaintenanceMode.values()));
27-
MaintenanceMode newMode = executeUpdate(currentMode, requestedMode, false);
25+
OperationMode currentMode = OperationMode.NORMAL;
26+
OperationMode requestedMode = randomValueOtherThan(currentMode, () -> randomFrom(OperationMode.values()));
27+
OperationMode newMode = executeUpdate(currentMode, requestedMode, false);
2828
assertThat(newMode, equalTo(requestedMode));
2929

30-
currentMode = MaintenanceMode.REQUESTED;
31-
requestedMode = randomValueOtherThan(currentMode, () -> randomFrom(MaintenanceMode.values()));
30+
currentMode = OperationMode.MAINTENANCE_REQUESTED;
31+
requestedMode = randomValueOtherThan(currentMode, () -> randomFrom(OperationMode.values()));
3232
newMode = executeUpdate(currentMode, requestedMode, false);
3333
assertThat(newMode, equalTo(requestedMode));
3434

3535
// assert no change when changing to the same mode
36-
currentMode = randomFrom(MaintenanceMode.values());
36+
currentMode = randomFrom(OperationMode.values());
3737
requestedMode = currentMode;
3838
newMode = executeUpdate(currentMode, currentMode, true);
3939
assertThat(newMode, equalTo(requestedMode));
4040

4141

4242
// assert no change when requesting to be put in maintenance-mode, but already in it
43-
newMode = executeUpdate(MaintenanceMode.IN, MaintenanceMode.REQUESTED, true);
44-
assertThat(newMode, equalTo(MaintenanceMode.IN));
43+
newMode = executeUpdate(OperationMode.MAINTENANCE, OperationMode.MAINTENANCE_REQUESTED, true);
44+
assertThat(newMode, equalTo(OperationMode.MAINTENANCE));
4545
}
4646

47-
private MaintenanceMode executeUpdate(MaintenanceMode currentMode, MaintenanceMode requestMode, boolean assertSameClusterState) {
47+
private OperationMode executeUpdate(OperationMode currentMode, OperationMode requestMode, boolean assertSameClusterState) {
4848
IndexLifecycleMetadata indexLifecycleMetadata = new IndexLifecycleMetadata(Collections.emptyMap(), currentMode);
4949
ImmutableOpenMap.Builder<String, MetaData.Custom> customsMapBuilder = ImmutableOpenMap.builder();
5050
MetaData metaData = MetaData.builder()

0 commit comments

Comments
 (0)