Skip to content

Commit 343bb08

Browse files
authored
Rename SLM package to slm (#44608)
This commit renames the SLM package from snapshotlifecycle to slm. We have all come to know index lifecycle management as ILM, the APIs and settings use ilm, and it would be nice of the package did too. For SLM, let's use slm for all of these including the package name from the beginning.
1 parent 8e0e8c3 commit 343bb08

19 files changed

+42
-42
lines changed

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/snapshotlifecycle/action/package-info.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66

77
/**
88
* Contains the action definitions for SLM. For the transport and rest action implementations, please see the {@code ilm} module's
9-
* {@code org.elasticsearch.xpack.snapshotlifecycle} package.
9+
* {@code org.elasticsearch.xpack.slm} package.
1010
*/
1111
package org.elasticsearch.xpack.core.snapshotlifecycle.action;

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/snapshotlifecycle/package-info.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
/**
88
* This is the Snapshot Lifecycle Management (SLM) core package. This package contains the core classes for SLM, including all of the
99
* custom cluster state metadata objects, execution history storage facilities, and the action definitions. For the main SLM service
10-
* implementation classes, please see the {@code ilm}ilm module's {@code org.elasticsearch.xpack.snapshotlifecycle} package.
10+
* implementation classes, please see the {@code ilm}ilm module's {@code org.elasticsearch.xpack.slm} package.
1111
*
1212
* <p>Contained within this specific package are the custom metadata objects and models used through out the SLM service. The names can
1313
* be confusing, so it's important to know the differences between each metadata object.
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* you may not use this file except in compliance with the Elastic License.
55
*/
66

7-
package org.elasticsearch.xpack.snapshotlifecycle;
7+
package org.elasticsearch.xpack.slm;
88

99
import org.apache.http.util.EntityUtils;
1010
import org.elasticsearch.action.index.IndexRequestBuilder;

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

+10-10
Original file line numberDiff line numberDiff line change
@@ -87,16 +87,16 @@
8787
import org.elasticsearch.xpack.indexlifecycle.action.TransportRetryAction;
8888
import org.elasticsearch.xpack.indexlifecycle.action.TransportStartILMAction;
8989
import org.elasticsearch.xpack.indexlifecycle.action.TransportStopILMAction;
90-
import org.elasticsearch.xpack.snapshotlifecycle.SnapshotLifecycleService;
91-
import org.elasticsearch.xpack.snapshotlifecycle.SnapshotLifecycleTask;
92-
import org.elasticsearch.xpack.snapshotlifecycle.action.RestDeleteSnapshotLifecycleAction;
93-
import org.elasticsearch.xpack.snapshotlifecycle.action.RestExecuteSnapshotLifecycleAction;
94-
import org.elasticsearch.xpack.snapshotlifecycle.action.RestGetSnapshotLifecycleAction;
95-
import org.elasticsearch.xpack.snapshotlifecycle.action.RestPutSnapshotLifecycleAction;
96-
import org.elasticsearch.xpack.snapshotlifecycle.action.TransportDeleteSnapshotLifecycleAction;
97-
import org.elasticsearch.xpack.snapshotlifecycle.action.TransportExecuteSnapshotLifecycleAction;
98-
import org.elasticsearch.xpack.snapshotlifecycle.action.TransportGetSnapshotLifecycleAction;
99-
import org.elasticsearch.xpack.snapshotlifecycle.action.TransportPutSnapshotLifecycleAction;
90+
import org.elasticsearch.xpack.slm.SnapshotLifecycleService;
91+
import org.elasticsearch.xpack.slm.SnapshotLifecycleTask;
92+
import org.elasticsearch.xpack.slm.action.RestDeleteSnapshotLifecycleAction;
93+
import org.elasticsearch.xpack.slm.action.RestExecuteSnapshotLifecycleAction;
94+
import org.elasticsearch.xpack.slm.action.RestGetSnapshotLifecycleAction;
95+
import org.elasticsearch.xpack.slm.action.RestPutSnapshotLifecycleAction;
96+
import org.elasticsearch.xpack.slm.action.TransportDeleteSnapshotLifecycleAction;
97+
import org.elasticsearch.xpack.slm.action.TransportExecuteSnapshotLifecycleAction;
98+
import org.elasticsearch.xpack.slm.action.TransportGetSnapshotLifecycleAction;
99+
import org.elasticsearch.xpack.slm.action.TransportPutSnapshotLifecycleAction;
100100

101101
import java.io.IOException;
102102
import java.time.Clock;
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* you may not use this file except in compliance with the Elastic License.
55
*/
66

7-
package org.elasticsearch.xpack.snapshotlifecycle;
7+
package org.elasticsearch.xpack.slm;
88

99
import org.apache.logging.log4j.LogManager;
1010
import org.apache.logging.log4j.Logger;
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* you may not use this file except in compliance with the Elastic License.
55
*/
66

7-
package org.elasticsearch.xpack.snapshotlifecycle;
7+
package org.elasticsearch.xpack.slm;
88

99
import org.apache.logging.log4j.LogManager;
1010
import org.apache.logging.log4j.Logger;
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* you may not use this file except in compliance with the Elastic License.
55
*/
66

7-
package org.elasticsearch.xpack.snapshotlifecycle.action;
7+
package org.elasticsearch.xpack.slm.action;
88

99
import org.elasticsearch.client.node.NodeClient;
1010
import org.elasticsearch.common.settings.Settings;
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* you may not use this file except in compliance with the Elastic License.
55
*/
66

7-
package org.elasticsearch.xpack.snapshotlifecycle.action;
7+
package org.elasticsearch.xpack.slm.action;
88

99
import org.elasticsearch.client.node.NodeClient;
1010
import org.elasticsearch.common.settings.Settings;
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* you may not use this file except in compliance with the Elastic License.
55
*/
66

7-
package org.elasticsearch.xpack.snapshotlifecycle.action;
7+
package org.elasticsearch.xpack.slm.action;
88

99
import org.elasticsearch.client.node.NodeClient;
1010
import org.elasticsearch.common.Strings;
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* you may not use this file except in compliance with the Elastic License.
55
*/
66

7-
package org.elasticsearch.xpack.snapshotlifecycle.action;
7+
package org.elasticsearch.xpack.slm.action;
88

99
import org.elasticsearch.client.node.NodeClient;
1010
import org.elasticsearch.common.settings.Settings;
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* you may not use this file except in compliance with the Elastic License.
55
*/
66

7-
package org.elasticsearch.xpack.snapshotlifecycle.action;
7+
package org.elasticsearch.xpack.slm.action;
88

99
import org.elasticsearch.ResourceNotFoundException;
1010
import org.elasticsearch.action.ActionListener;
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* you may not use this file except in compliance with the Elastic License.
55
*/
66

7-
package org.elasticsearch.xpack.snapshotlifecycle.action;
7+
package org.elasticsearch.xpack.slm.action;
88

99
import org.apache.logging.log4j.LogManager;
1010
import org.apache.logging.log4j.Logger;
@@ -27,8 +27,8 @@
2727
import org.elasticsearch.xpack.core.snapshotlifecycle.SnapshotLifecyclePolicyMetadata;
2828
import org.elasticsearch.xpack.core.snapshotlifecycle.action.ExecuteSnapshotLifecycleAction;
2929
import org.elasticsearch.xpack.core.snapshotlifecycle.history.SnapshotHistoryStore;
30-
import org.elasticsearch.xpack.snapshotlifecycle.SnapshotLifecycleService;
31-
import org.elasticsearch.xpack.snapshotlifecycle.SnapshotLifecycleTask;
30+
import org.elasticsearch.xpack.slm.SnapshotLifecycleService;
31+
import org.elasticsearch.xpack.slm.SnapshotLifecycleTask;
3232

3333
import java.io.IOException;
3434
import java.util.Optional;
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* you may not use this file except in compliance with the Elastic License.
55
*/
66

7-
package org.elasticsearch.xpack.snapshotlifecycle.action;
7+
package org.elasticsearch.xpack.slm.action;
88

99
import org.apache.logging.log4j.LogManager;
1010
import org.apache.logging.log4j.Logger;
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* you may not use this file except in compliance with the Elastic License.
55
*/
66

7-
package org.elasticsearch.xpack.snapshotlifecycle.action;
7+
package org.elasticsearch.xpack.slm.action;
88

99
import org.apache.logging.log4j.LogManager;
1010
import org.apache.logging.log4j.Logger;
@@ -30,7 +30,7 @@
3030
import org.elasticsearch.xpack.core.snapshotlifecycle.SnapshotLifecycleMetadata;
3131
import org.elasticsearch.xpack.core.snapshotlifecycle.SnapshotLifecyclePolicyMetadata;
3232
import org.elasticsearch.xpack.core.snapshotlifecycle.action.PutSnapshotLifecycleAction;
33-
import org.elasticsearch.xpack.snapshotlifecycle.SnapshotLifecycleService;
33+
import org.elasticsearch.xpack.slm.SnapshotLifecycleService;
3434

3535
import java.io.IOException;
3636
import java.time.Instant;
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
/**
88
* This package contains all the SLM Rest and Transport actions.
99
*
10-
* <p>The {@link org.elasticsearch.xpack.snapshotlifecycle.action.TransportPutSnapshotLifecycleAction} creates or updates a snapshot
11-
* lifecycle policy in the cluster state. The {@link org.elasticsearch.xpack.snapshotlifecycle.action.TransportGetSnapshotLifecycleAction}
12-
* simply retrieves a policy by id. The {@link org.elasticsearch.xpack.snapshotlifecycle.action.TransportDeleteSnapshotLifecycleAction}
10+
* <p>The {@link org.elasticsearch.xpack.slm.action.TransportPutSnapshotLifecycleAction} creates or updates a snapshot
11+
* lifecycle policy in the cluster state. The {@link org.elasticsearch.xpack.slm.action.TransportGetSnapshotLifecycleAction}
12+
* simply retrieves a policy by id. The {@link org.elasticsearch.xpack.slm.action.TransportDeleteSnapshotLifecycleAction}
1313
* removes a policy from the cluster state. These actions only interact with the cluster state. Most of the logic that take place in
14-
* response to these actions happens on the master node in the {@link org.elasticsearch.xpack.snapshotlifecycle.SnapshotLifecycleService}.
14+
* response to these actions happens on the master node in the {@link org.elasticsearch.xpack.slm.SnapshotLifecycleService}.
1515
*
16-
* <p>The {@link org.elasticsearch.xpack.snapshotlifecycle.action.TransportExecuteSnapshotLifecycleAction} operates as if the snapshot
16+
* <p>The {@link org.elasticsearch.xpack.slm.action.TransportExecuteSnapshotLifecycleAction} operates as if the snapshot
1717
* policy given was immediately triggered by the scheduler. It does not interfere with any currently scheduled operations, it just runs
1818
* the snapshot operation ad hoc.
1919
*/
20-
package org.elasticsearch.xpack.snapshotlifecycle.action;
20+
package org.elasticsearch.xpack.slm.action;
+7-7
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,30 @@
88
* This is the Snapshot Lifecycle Management (SLM) main package. SLM is part of the wider ILM feature, reusing quite a bit of the
99
* functionality for itself in some places, which is why the two features are contained in the same plugin.
1010
*
11-
* This package contains the {@link org.elasticsearch.xpack.snapshotlifecycle.SnapshotLifecycleService} and
12-
* {@link org.elasticsearch.xpack.snapshotlifecycle.SnapshotLifecycleTask}, as well as the Rest and Transport actions for the
11+
* This package contains the {@link org.elasticsearch.xpack.slm.SnapshotLifecycleService} and
12+
* {@link org.elasticsearch.xpack.slm.SnapshotLifecycleTask}, as well as the Rest and Transport actions for the
1313
* feature set.
1414
* This package contains the primary execution logic and most of the user facing
1515
* surface area for the plugin, but not everything. The model objects for the cluster state as well as several supporting classes are
1616
* contained in the {@link org.elasticsearch.xpack.core.snapshotlifecycle} package.
1717
*
18-
* <p>{@link org.elasticsearch.xpack.snapshotlifecycle.SnapshotLifecycleService} maintains an internal
18+
* <p>{@link org.elasticsearch.xpack.slm.SnapshotLifecycleService} maintains an internal
1919
* {@link org.elasticsearch.xpack.core.scheduler.SchedulerEngine SchedulerEngine} that handles scheduling snapshots. The service
2020
* executes on the currently elected master node. It listens to the cluster state, detecting new policies to schedule, and unscheduling
2121
* policies when they are deleted or if ILM is stopped. The bulk of this scheduling management is handled within
22-
* {@link org.elasticsearch.xpack.snapshotlifecycle.SnapshotLifecycleService#maybeScheduleSnapshot(SnapshotLifecyclePolicyMetadata)}
22+
* {@link org.elasticsearch.xpack.slm.SnapshotLifecycleService#maybeScheduleSnapshot(SnapshotLifecyclePolicyMetadata)}
2323
* which is executed on all snapshot policies each update.
2424
*
25-
* <p>The {@link org.elasticsearch.xpack.snapshotlifecycle.SnapshotLifecycleTask} object is what receives an event when a scheduled policy
25+
* <p>The {@link org.elasticsearch.xpack.slm.SnapshotLifecycleTask} object is what receives an event when a scheduled policy
2626
* is triggered for execution. It constructs a snapshot request and runs it as the user who originally set up the policy. The bulk of this
2727
* logic is contained in the
28-
* {@link org.elasticsearch.xpack.snapshotlifecycle.SnapshotLifecycleTask#maybeTakeSnapshot(String, Client, ClusterService,
28+
* {@link org.elasticsearch.xpack.slm.SnapshotLifecycleTask#maybeTakeSnapshot(String, Client, ClusterService,
2929
* SnapshotHistoryStore)} method. After a snapshot request has been submitted, it persists the result (success or failure) in a history
3030
* store (an index), caching the latest success and failure information in the cluster state. It is important to note that this task
3131
* fires the snapshot request off and forgets it; It does not wait until the entire snapshot completes. Any success or failure that this
3232
* task sees will be from the initial submission of the snapshot request only.
3333
*/
34-
package org.elasticsearch.xpack.snapshotlifecycle;
34+
package org.elasticsearch.xpack.slm;
3535

3636
import org.elasticsearch.client.Client;
3737
import org.elasticsearch.cluster.service.ClusterService;
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* you may not use this file except in compliance with the Elastic License.
55
*/
66

7-
package org.elasticsearch.xpack.snapshotlifecycle;
7+
package org.elasticsearch.xpack.slm;
88

99
import org.elasticsearch.common.ValidationException;
1010
import org.elasticsearch.common.io.stream.Writeable;
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* you may not use this file except in compliance with the Elastic License.
55
*/
66

7-
package org.elasticsearch.xpack.snapshotlifecycle;
7+
package org.elasticsearch.xpack.slm;
88

99
import org.elasticsearch.cluster.ClusterChangedEvent;
1010
import org.elasticsearch.cluster.ClusterName;
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* you may not use this file except in compliance with the Elastic License.
55
*/
66

7-
package org.elasticsearch.xpack.snapshotlifecycle;
7+
package org.elasticsearch.xpack.slm;
88

99
import org.apache.lucene.util.SetOnce;
1010
import org.elasticsearch.Version;

0 commit comments

Comments
 (0)