forked from elastic/elasticsearch
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Moving the data stream reindex task to x-pack (elastic#117927)
- Loading branch information
Showing
15 changed files
with
173 additions
and
147 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| apply plugin: 'elasticsearch.internal-es-plugin' | ||
| apply plugin: 'elasticsearch.internal-cluster-test' | ||
|
|
||
| esplugin { | ||
| name 'x-pack-migrate' | ||
| description 'Elasticsearch Expanded Pack Plugin - Index and Data Stream Migration' | ||
| classname 'org.elasticsearch.xpack.migrate.MigratePlugin' | ||
| extendedPlugins = ['x-pack-core'] | ||
| hasNativeController false | ||
| requiresKeystore true | ||
| } | ||
| base { | ||
| archivesName = 'x-pack-migrate' | ||
| } | ||
|
|
||
| dependencies { | ||
| compileOnly project(path: xpackModule('core')) | ||
| testImplementation(testArtifact(project(xpackModule('core')))) | ||
| testImplementation project(xpackModule('ccr')) | ||
| testImplementation project(':modules:data-streams') | ||
| testImplementation project(path: ':modules:reindex') | ||
| } | ||
|
|
||
| addQaCheckDependencies(project) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
90 changes: 90 additions & 0 deletions
90
x-pack/plugin/migrate/src/main/java/org/elasticsearch/xpack/migrate/MigratePlugin.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0; you may not use this file except in compliance with the Elastic License | ||
| * 2.0. | ||
| */ | ||
|
|
||
| package org.elasticsearch.xpack.migrate; | ||
|
|
||
| import org.elasticsearch.action.ActionRequest; | ||
| import org.elasticsearch.action.ActionResponse; | ||
| import org.elasticsearch.client.internal.Client; | ||
| import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver; | ||
| import org.elasticsearch.cluster.service.ClusterService; | ||
| import org.elasticsearch.common.io.stream.NamedWriteableRegistry; | ||
| import org.elasticsearch.common.settings.SettingsModule; | ||
| import org.elasticsearch.persistent.PersistentTaskParams; | ||
| import org.elasticsearch.persistent.PersistentTaskState; | ||
| import org.elasticsearch.persistent.PersistentTasksExecutor; | ||
| import org.elasticsearch.plugins.ActionPlugin; | ||
| import org.elasticsearch.plugins.PersistentTaskPlugin; | ||
| import org.elasticsearch.plugins.Plugin; | ||
| import org.elasticsearch.tasks.Task; | ||
| import org.elasticsearch.threadpool.ThreadPool; | ||
| import org.elasticsearch.xcontent.NamedXContentRegistry; | ||
| import org.elasticsearch.xcontent.ParseField; | ||
| import org.elasticsearch.xpack.migrate.action.ReindexDataStreamAction; | ||
| import org.elasticsearch.xpack.migrate.action.ReindexDataStreamTransportAction; | ||
| import org.elasticsearch.xpack.migrate.task.ReindexDataStreamPersistentTaskExecutor; | ||
| import org.elasticsearch.xpack.migrate.task.ReindexDataStreamPersistentTaskState; | ||
| import org.elasticsearch.xpack.migrate.task.ReindexDataStreamStatus; | ||
| import org.elasticsearch.xpack.migrate.task.ReindexDataStreamTask; | ||
| import org.elasticsearch.xpack.migrate.task.ReindexDataStreamTaskParams; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| public class MigratePlugin extends Plugin implements ActionPlugin, PersistentTaskPlugin { | ||
|
|
||
| @Override | ||
| public List<ActionHandler<? extends ActionRequest, ? extends ActionResponse>> getActions() { | ||
| List<ActionHandler<? extends ActionRequest, ? extends ActionResponse>> actions = new ArrayList<>(); | ||
| actions.add(new ActionHandler<>(ReindexDataStreamAction.INSTANCE, ReindexDataStreamTransportAction.class)); | ||
| return actions; | ||
| } | ||
|
|
||
| @Override | ||
| public List<NamedXContentRegistry.Entry> getNamedXContent() { | ||
| return List.of( | ||
| new NamedXContentRegistry.Entry( | ||
| PersistentTaskState.class, | ||
| new ParseField(ReindexDataStreamPersistentTaskState.NAME), | ||
| ReindexDataStreamPersistentTaskState::fromXContent | ||
| ), | ||
| new NamedXContentRegistry.Entry( | ||
| PersistentTaskParams.class, | ||
| new ParseField(ReindexDataStreamTaskParams.NAME), | ||
| ReindexDataStreamTaskParams::fromXContent | ||
| ) | ||
| ); | ||
| } | ||
|
|
||
| @Override | ||
| public List<NamedWriteableRegistry.Entry> getNamedWriteables() { | ||
| return List.of( | ||
| new NamedWriteableRegistry.Entry( | ||
| PersistentTaskState.class, | ||
| ReindexDataStreamPersistentTaskState.NAME, | ||
| ReindexDataStreamPersistentTaskState::new | ||
| ), | ||
| new NamedWriteableRegistry.Entry( | ||
| PersistentTaskParams.class, | ||
| ReindexDataStreamTaskParams.NAME, | ||
| ReindexDataStreamTaskParams::new | ||
| ), | ||
| new NamedWriteableRegistry.Entry(Task.Status.class, ReindexDataStreamStatus.NAME, ReindexDataStreamStatus::new) | ||
| ); | ||
| } | ||
|
|
||
| @Override | ||
| public List<PersistentTasksExecutor<?>> getPersistentTasksExecutor( | ||
| ClusterService clusterService, | ||
| ThreadPool threadPool, | ||
| Client client, | ||
| SettingsModule settingsModule, | ||
| IndexNameExpressionResolver expressionResolver | ||
| ) { | ||
| return List.of(new ReindexDataStreamPersistentTaskExecutor(client, clusterService, ReindexDataStreamTask.TASK_NAME, threadPool)); | ||
| } | ||
| } |
10 changes: 4 additions & 6 deletions
10
.../datastreams/ReindexDataStreamAction.java → ...grate/action/ReindexDataStreamAction.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
19 changes: 8 additions & 11 deletions
19
...ion/ReindexDataStreamTransportAction.java → ...ion/ReindexDataStreamTransportAction.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 4 additions & 6 deletions
10
...ndexDataStreamPersistentTaskExecutor.java → ...ndexDataStreamPersistentTaskExecutor.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 4 additions & 6 deletions
10
...ReindexDataStreamPersistentTaskState.java → ...ReindexDataStreamPersistentTaskState.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.