From 294e0fcef8572cacda6a858e7357da92d776fccc Mon Sep 17 00:00:00 2001 From: Tim Brooks Date: Tue, 4 Dec 2018 18:15:06 -0700 Subject: [PATCH] Rename internal repository actions to be internal This is a follow-up to #36086. It renames the internal repository actions to be prefixed by "internal". This allows the system user to execute the actions. Additionally, this PR stops casting Client to NodeClient. The client we have is a NodeClient so executing the actions will be local. --- .../src/main/java/org/elasticsearch/xpack/ccr/Ccr.java | 3 +-- .../elasticsearch/xpack/ccr/CcrRepositoryManager.java | 10 +++++----- .../DeleteInternalCcrRepositoryAction.java | 2 +- .../repositories/PutInternalCcrRepositoryAction.java | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/Ccr.java b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/Ccr.java index 7cceecbd399a5..25285cc7fd660 100644 --- a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/Ccr.java +++ b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/Ccr.java @@ -10,7 +10,6 @@ import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.client.Client; -import org.elasticsearch.client.node.NodeClient; import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver; import org.elasticsearch.cluster.node.DiscoveryNodes; import org.elasticsearch.cluster.service.ClusterService; @@ -151,7 +150,7 @@ public Collection createComponents( return emptyList(); } - this.repositoryManager.set(new CcrRepositoryManager(settings, clusterService, (NodeClient) client)); + this.repositoryManager.set(new CcrRepositoryManager(settings, clusterService, client)); return Arrays.asList( ccrLicenseChecker, diff --git a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/CcrRepositoryManager.java b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/CcrRepositoryManager.java index f86789a880e24..a1504ff2f8acd 100644 --- a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/CcrRepositoryManager.java +++ b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/CcrRepositoryManager.java @@ -8,7 +8,7 @@ import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.support.PlainActionFuture; -import org.elasticsearch.client.node.NodeClient; +import org.elasticsearch.client.Client; import org.elasticsearch.cluster.service.ClusterService; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.transport.RemoteClusterAware; @@ -22,9 +22,9 @@ class CcrRepositoryManager extends RemoteClusterAware { - private final NodeClient client; + private final Client client; - CcrRepositoryManager(Settings settings, ClusterService clusterService, NodeClient client) { + CcrRepositoryManager(Settings settings, ClusterService clusterService, Client client) { super(settings); this.client = client; listenForUpdates(clusterService.getClusterSettings()); @@ -36,12 +36,12 @@ protected void updateRemoteCluster(String clusterAlias, List addresses, if (addresses.isEmpty()) { DeleteInternalCcrRepositoryRequest request = new DeleteInternalCcrRepositoryRequest(repositoryName); PlainActionFuture f = PlainActionFuture.newFuture(); - client.executeLocally(DeleteInternalCcrRepositoryAction.INSTANCE, request, f); + client.execute(DeleteInternalCcrRepositoryAction.INSTANCE, request, f); assert f.isDone() : "Should be completed as it is executed synchronously"; } else { ActionRequest request = new PutInternalCcrRepositoryRequest(repositoryName, CcrRepository.TYPE); PlainActionFuture f = PlainActionFuture.newFuture(); - client.executeLocally(PutInternalCcrRepositoryAction.INSTANCE, request, f); + client.execute(PutInternalCcrRepositoryAction.INSTANCE, request, f); assert f.isDone() : "Should be completed as it is executed synchronously"; } } diff --git a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/repositories/DeleteInternalCcrRepositoryAction.java b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/repositories/DeleteInternalCcrRepositoryAction.java index e85ce65858e0f..93d432fe93fed 100644 --- a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/repositories/DeleteInternalCcrRepositoryAction.java +++ b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/repositories/DeleteInternalCcrRepositoryAction.java @@ -23,7 +23,7 @@ public class DeleteInternalCcrRepositoryAction extends Action { public static final DeleteInternalCcrRepositoryAction INSTANCE = new DeleteInternalCcrRepositoryAction(); - public static final String NAME = "cluster:admin/ccr/internal_repository/delete"; + public static final String NAME = "internal:admin/ccr/internal_repository/delete"; private DeleteInternalCcrRepositoryAction() { super(NAME); diff --git a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/repositories/PutInternalCcrRepositoryAction.java b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/repositories/PutInternalCcrRepositoryAction.java index 2d12cc4d77ad1..397137ffb494a 100644 --- a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/repositories/PutInternalCcrRepositoryAction.java +++ b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/repositories/PutInternalCcrRepositoryAction.java @@ -23,7 +23,7 @@ public class PutInternalCcrRepositoryAction extends Action { public static final PutInternalCcrRepositoryAction INSTANCE = new PutInternalCcrRepositoryAction(); - public static final String NAME = "cluster:admin/ccr/internal_repository/put"; + public static final String NAME = "internal:admin/ccr/internal_repository/put"; private PutInternalCcrRepositoryAction() { super(NAME);