Skip to content

Add origin to client in SLM task #135484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 26, 2025
Merged

Add origin to client in SLM task #135484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c5b288d
Use INDEX_LIFECYCLE_ORIGIN in SLM task
samxbr Sep 25, 2025
a495f4f
Merge branch 'main' into fix/slm-client
samxbr Sep 25, 2025
eedeb93
Update docs/changelog/135484.yaml
samxbr Sep 25, 2025
2d86fa0
wrap at constructor
samxbr Sep 26, 2025
030c857
fix tests
samxbr Sep 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions docs/changelog/135484.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 135484
summary: Add origin to client in SLM task
area: ILM+SLM
type: bug
issues: []
3 changes: 2 additions & 1 deletion x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/SnapshotLifecycleTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import org.elasticsearch.action.admin.cluster.snapshots.get.GetSnapshotsRequest;
import org.elasticsearch.action.admin.cluster.snapshots.get.TransportGetSnapshotsAction;
import org.elasticsearch.client.internal.Client;
import org.elasticsearch.client.internal.OriginSettingClient;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.ClusterStateUpdateTask;
import org.elasticsearch.cluster.ProjectState;
Expand Down Expand Up @@ -79,7 +80,7 @@ public SnapshotLifecycleTask(
final SnapshotHistoryStore historyStore
) {
this.projectId = projectId;
this.client = client;
this.client = new OriginSettingClient(client, ClientHelper.INDEX_LIFECYCLE_ORIGIN);
this.clusterService = clusterService;
this.historyStore = historyStore;
}
Expand Down
14 changes: 8 additions & 6 deletions ...k/plugin/slm/src/test/java/org/elasticsearch/xpack/slm/SnapshotLifecycleServiceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
package org.elasticsearch.xpack.slm;

import org.apache.lucene.util.SetOnce;
import org.elasticsearch.client.internal.Client;
import org.elasticsearch.cluster.ClusterChangedEvent;
import org.elasticsearch.cluster.ClusterName;
import org.elasticsearch.cluster.ClusterState;
Expand All @@ -31,6 +32,7 @@
import org.elasticsearch.core.TimeValue;
import org.elasticsearch.test.ClusterServiceUtils;
import org.elasticsearch.test.ESTestCase;
import org.elasticsearch.test.client.NoOpClient;
import org.elasticsearch.threadpool.TestThreadPool;
import org.elasticsearch.threadpool.ThreadPool;
import org.elasticsearch.xpack.core.ilm.LifecycleSettings;
Expand Down Expand Up @@ -129,7 +131,7 @@ public void testNothingScheduledWhenNotRunning() throws InterruptedException {
ClusterService clusterService = ClusterServiceUtils.createClusterService(initialState, threadPool);
SnapshotLifecycleService sls = new SnapshotLifecycleService(
Settings.EMPTY,
(projectId) -> new FakeSnapshotTask(e -> logger.info("triggered")),
(projectId) -> new FakeSnapshotTask(e -> logger.info("triggered"), new NoOpClient(threadPool)),
clusterService,
clock
)
Expand Down Expand Up @@ -198,7 +200,7 @@ public void testPolicyCRUD() throws Exception {
ClusterService clusterService = ClusterServiceUtils.createClusterService(threadPool);
SnapshotLifecycleService sls = new SnapshotLifecycleService(
Settings.EMPTY,
(projectId) -> new FakeSnapshotTask(e -> trigger.get().accept(e)),
(projectId) -> new FakeSnapshotTask(e -> trigger.get().accept(e), new NoOpClient(threadPool)),
clusterService,
clock
)
Expand Down Expand Up @@ -329,7 +331,7 @@ public void testPolicyNamesEndingInNumbers() throws Exception {
ClusterService clusterService = ClusterServiceUtils.createClusterService(threadPool);
SnapshotLifecycleService sls = new SnapshotLifecycleService(
Settings.EMPTY,
(projectId) -> new FakeSnapshotTask(e -> trigger.get().accept(e)),
(projectId) -> new FakeSnapshotTask(e -> trigger.get().accept(e), new NoOpClient(threadPool)),
clusterService,
clock
)
Expand Down Expand Up @@ -509,7 +511,7 @@ public void submitUnbatchedStateUpdateTask(String source, ClusterStateUpdateTask

SnapshotLifecycleService service = new SnapshotLifecycleService(
Settings.EMPTY,
(projectId) -> new SnapshotLifecycleTask(projectId, null, null, null),
(projectId) -> new SnapshotLifecycleTask(projectId, new NoOpClient(threadPool), null, null),
fakeService,
clock
);
Expand All @@ -529,8 +531,8 @@ public void submitUnbatchedStateUpdateTask(String source, ClusterStateUpdateTask
class FakeSnapshotTask extends SnapshotLifecycleTask {
private final Consumer<SchedulerEngine.Event> onTriggered;

FakeSnapshotTask(Consumer<SchedulerEngine.Event> onTriggered) {
super(projectId, null, null, null);
FakeSnapshotTask(Consumer<SchedulerEngine.Event> onTriggered, Client client) {
super(projectId, client, null, null);
this.onTriggered = onTriggered;
}

Expand Down