Skip to content

Commit 8bcd6d3

Browse files
committed
Expose CCR to the transport client (#33608)
This commit exposes CCR to the transport client.
1 parent 043cf3c commit 8bcd6d3

32 files changed

+1972
-1731
lines changed

x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/Ccr.java

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,21 @@
4040
import org.elasticsearch.threadpool.ThreadPool;
4141
import org.elasticsearch.watcher.ResourceWatcherService;
4242
import org.elasticsearch.xpack.ccr.action.AutoFollowCoordinator;
43-
import org.elasticsearch.xpack.ccr.action.CcrStatsAction;
44-
import org.elasticsearch.xpack.ccr.action.CreateAndFollowIndexAction;
43+
import org.elasticsearch.xpack.ccr.action.TransportUnfollowIndexAction;
44+
import org.elasticsearch.xpack.core.ccr.action.CcrStatsAction;
45+
import org.elasticsearch.xpack.ccr.action.TransportCreateAndFollowIndexAction;
46+
import org.elasticsearch.xpack.ccr.action.TransportFollowIndexAction;
47+
import org.elasticsearch.xpack.core.ccr.action.CreateAndFollowIndexAction;
4548
import org.elasticsearch.xpack.ccr.action.DeleteAutoFollowPatternAction;
46-
import org.elasticsearch.xpack.ccr.action.FollowIndexAction;
49+
import org.elasticsearch.xpack.core.ccr.action.FollowIndexAction;
4750
import org.elasticsearch.xpack.ccr.action.PutAutoFollowPatternAction;
4851
import org.elasticsearch.xpack.ccr.action.ShardChangesAction;
49-
import org.elasticsearch.xpack.ccr.action.ShardFollowNodeTask;
5052
import org.elasticsearch.xpack.ccr.action.ShardFollowTask;
5153
import org.elasticsearch.xpack.ccr.action.ShardFollowTasksExecutor;
5254
import org.elasticsearch.xpack.ccr.action.TransportCcrStatsAction;
5355
import org.elasticsearch.xpack.ccr.action.TransportDeleteAutoFollowPatternAction;
5456
import org.elasticsearch.xpack.ccr.action.TransportPutAutoFollowPatternAction;
55-
import org.elasticsearch.xpack.ccr.action.UnfollowIndexAction;
57+
import org.elasticsearch.xpack.core.ccr.action.UnfollowIndexAction;
5658
import org.elasticsearch.xpack.ccr.action.bulk.BulkShardOperationsAction;
5759
import org.elasticsearch.xpack.ccr.action.bulk.TransportBulkShardOperationsAction;
5860
import org.elasticsearch.xpack.ccr.index.engine.FollowingEngineFactory;
@@ -64,6 +66,7 @@
6466
import org.elasticsearch.xpack.ccr.rest.RestUnfollowIndexAction;
6567
import org.elasticsearch.xpack.core.XPackClientActionPlugin;
6668
import org.elasticsearch.xpack.core.XPackPlugin;
69+
import org.elasticsearch.xpack.core.ccr.ShardFollowNodeTaskStatus;
6770

6871
import java.util.Arrays;
6972
import java.util.Collection;
@@ -154,9 +157,9 @@ public List<PersistentTasksExecutor<?>> getPersistentTasksExecutor(ClusterServic
154157
// stats action
155158
new ActionHandler<>(CcrStatsAction.INSTANCE, TransportCcrStatsAction.class),
156159
// follow actions
157-
new ActionHandler<>(CreateAndFollowIndexAction.INSTANCE, CreateAndFollowIndexAction.TransportAction.class),
158-
new ActionHandler<>(FollowIndexAction.INSTANCE, FollowIndexAction.TransportAction.class),
159-
new ActionHandler<>(UnfollowIndexAction.INSTANCE, UnfollowIndexAction.TransportAction.class),
160+
new ActionHandler<>(CreateAndFollowIndexAction.INSTANCE, TransportCreateAndFollowIndexAction.class),
161+
new ActionHandler<>(FollowIndexAction.INSTANCE, TransportFollowIndexAction.class),
162+
new ActionHandler<>(UnfollowIndexAction.INSTANCE, TransportUnfollowIndexAction.class),
160163
// auto-follow actions
161164
new ActionHandler<>(DeleteAutoFollowPatternAction.INSTANCE, TransportDeleteAutoFollowPatternAction.class),
162165
new ActionHandler<>(PutAutoFollowPatternAction.INSTANCE, TransportPutAutoFollowPatternAction.class));
@@ -185,8 +188,8 @@ public List<NamedWriteableRegistry.Entry> getNamedWriteables() {
185188
ShardFollowTask::new),
186189

187190
// Task statuses
188-
new NamedWriteableRegistry.Entry(Task.Status.class, ShardFollowNodeTask.Status.STATUS_PARSER_NAME,
189-
ShardFollowNodeTask.Status::new)
191+
new NamedWriteableRegistry.Entry(Task.Status.class, ShardFollowNodeTaskStatus.STATUS_PARSER_NAME,
192+
ShardFollowNodeTaskStatus::new)
190193
);
191194
}
192195

@@ -198,9 +201,9 @@ public List<NamedXContentRegistry.Entry> getNamedXContent() {
198201

199202
// Task statuses
200203
new NamedXContentRegistry.Entry(
201-
ShardFollowNodeTask.Status.class,
202-
new ParseField(ShardFollowNodeTask.Status.STATUS_PARSER_NAME),
203-
ShardFollowNodeTask.Status::fromXContent));
204+
ShardFollowNodeTaskStatus.class,
205+
new ParseField(ShardFollowNodeTaskStatus.STATUS_PARSER_NAME),
206+
ShardFollowNodeTaskStatus::fromXContent));
204207
}
205208

206209
/**

x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/AutoFollowCoordinator.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
import org.elasticsearch.xpack.ccr.CcrSettings;
2828
import org.elasticsearch.xpack.core.ccr.AutoFollowMetadata;
2929
import org.elasticsearch.xpack.core.ccr.AutoFollowMetadata.AutoFollowPattern;
30+
import org.elasticsearch.xpack.core.ccr.action.CreateAndFollowIndexAction;
31+
import org.elasticsearch.xpack.core.ccr.action.FollowIndexAction;
3032

3133
import java.util.ArrayList;
3234
import java.util.HashMap;

0 commit comments

Comments
 (0)