Skip to content

Commit e1fbf67

Browse files
nielsbaumannielsbauman
committed
Remove usages in index template registry
1 parent 7519927 commit e1fbf67

File tree

52 files changed

+98
-291
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+98
-291
lines changed

‎server/src/main/java/org/elasticsearch/cluster/project/ProjectResolver.java‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,12 @@
99

1010
package org.elasticsearch.cluster.project;
1111

12-
import org.elasticsearch.action.ActionListener;
13-
import org.elasticsearch.action.ActionRequest;
14-
import org.elasticsearch.action.ActionResponse;
15-
import org.elasticsearch.action.ActionType;
16-
import org.elasticsearch.client.internal.Client;
17-
import org.elasticsearch.client.internal.FilterClient;
1812
import org.elasticsearch.cluster.ClusterState;
1913
import org.elasticsearch.cluster.ProjectState;
2014
import org.elasticsearch.cluster.metadata.Metadata;
2115
import org.elasticsearch.cluster.metadata.ProjectId;
2216
import org.elasticsearch.cluster.metadata.ProjectMetadata;
2317
import org.elasticsearch.core.CheckedRunnable;
24-
import org.elasticsearch.core.FixForMultiProject;
2518

2619
import java.util.Collection;
2720
import java.util.Objects;
@@ -91,26 +84,4 @@ default Collection<ProjectId> getProjectIds(ClusterState clusterState) {
9184
* It is an error to attempt to override the active project-id
9285
*/
9386
<E extends Exception> void executeOnProject(ProjectId projectId, CheckedRunnable<E> body) throws E;
94-
95-
/**
96-
* Returns a client that executes every request in the context of the given project.
97-
*/
98-
@FixForMultiProject(description = "This recreates a client on every invocation. We should optimize this to be less wasteful")
99-
default Client projectClient(Client baseClient, ProjectId projectId) {
100-
// We only take the shortcut when the given project ID matches the "current" project ID. If it doesn't, we'll let #executeOnProject
101-
// take care of error handling.
102-
if (supportsMultipleProjects() == false && projectId.equals(getProjectId())) {
103-
return baseClient;
104-
}
105-
return new FilterClient(baseClient) {
106-
@Override
107-
protected <Request extends ActionRequest, Response extends ActionResponse> void doExecute(
108-
ActionType<Response> action,
109-
Request request,
110-
ActionListener<Response> listener
111-
) {
112-
executeOnProject(projectId, () -> super.doExecute(action, request, listener));
113-
}
114-
};
115-
}
11687
}

‎test/framework/src/main/java/org/elasticsearch/test/client/NoOpClient.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import org.elasticsearch.action.ActionResponse;
1515
import org.elasticsearch.action.ActionType;
1616
import org.elasticsearch.client.internal.support.AbstractClient;
17+
import org.elasticsearch.cluster.project.ProjectResolver;
1718
import org.elasticsearch.cluster.project.TestProjectResolvers;
1819
import org.elasticsearch.common.settings.Settings;
1920
import org.elasticsearch.threadpool.ThreadPool;
@@ -30,6 +31,10 @@ public NoOpClient(ThreadPool threadPool) {
3031
super(Settings.EMPTY, threadPool, TestProjectResolvers.mustExecuteFirst());
3132
}
3233

34+
public NoOpClient(ThreadPool threadPool, ProjectResolver projectResolver) {
35+
super(Settings.EMPTY, threadPool, projectResolver);
36+
}
37+
3338
@Override
3439
protected <Request extends ActionRequest, Response extends ActionResponse> void doExecute(
3540
ActionType<Response> action,

‎x-pack/plugin/apm-data/src/main/java/org/elasticsearch/xpack/apmdata/APMIndexTemplateRegistry.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
package org.elasticsearch.xpack.apmdata;
99

1010
import org.elasticsearch.client.internal.Client;
11-
import org.elasticsearch.cluster.project.ProjectResolver;
1211
import org.elasticsearch.cluster.service.ClusterService;
1312
import org.elasticsearch.common.settings.Settings;
1413
import org.elasticsearch.threadpool.ThreadPool;
@@ -33,17 +32,15 @@ public APMIndexTemplateRegistry(
3332
ClusterService clusterService,
3433
ThreadPool threadPool,
3534
Client client,
36-
NamedXContentRegistry xContentRegistry,
37-
ProjectResolver projectResolver
35+
NamedXContentRegistry xContentRegistry
3836
) {
3937
super(
4038
nodeSettings,
4139
clusterService,
4240
threadPool,
4341
client,
4442
xContentRegistry,
45-
templateFilter(isDataStreamsLifecycleOnlyMode(clusterService.getSettings())),
46-
projectResolver
43+
templateFilter(isDataStreamsLifecycleOnlyMode(clusterService.getSettings()))
4744
);
4845
}
4946

‎x-pack/plugin/apm-data/src/main/java/org/elasticsearch/xpack/apmdata/APMPlugin.java‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,7 @@ public Collection<?> createComponents(PluginServices services) {
4848
Settings settings = services.environment().settings();
4949
ClusterService clusterService = services.clusterService();
5050
registry.set(
51-
new APMIndexTemplateRegistry(
52-
settings,
53-
clusterService,
54-
services.threadPool(),
55-
services.client(),
56-
services.xContentRegistry(),
57-
services.projectResolver()
58-
)
51+
new APMIndexTemplateRegistry(settings, clusterService, services.threadPool(), services.client(), services.xContentRegistry())
5952
);
6053
if (enabled) {
6154
APMIndexTemplateRegistry registryInstance = registry.get();

‎x-pack/plugin/apm-data/src/test/java/org/elasticsearch/xpack/apmdata/APMDSLOnlyTests.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import org.elasticsearch.cluster.metadata.DataStreamLifecycle;
1212
import org.elasticsearch.cluster.node.DiscoveryNode;
1313
import org.elasticsearch.cluster.node.DiscoveryNodeUtils;
14-
import org.elasticsearch.cluster.project.TestProjectResolvers;
1514
import org.elasticsearch.cluster.service.ClusterService;
1615
import org.elasticsearch.common.settings.ClusterSettings;
1716
import org.elasticsearch.common.settings.Settings;
@@ -60,8 +59,7 @@ public void createRegistryAndClient() {
6059
clusterService,
6160
threadPool,
6261
client,
63-
NamedXContentRegistry.EMPTY,
64-
TestProjectResolvers.mustExecuteFirst()
62+
NamedXContentRegistry.EMPTY
6563
);
6664
apmIndexTemplateRegistry.setEnabled(true);
6765
}

‎x-pack/plugin/apm-data/src/test/java/org/elasticsearch/xpack/apmdata/APMIndexTemplateRegistryTests.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
import org.elasticsearch.cluster.node.DiscoveryNode;
2727
import org.elasticsearch.cluster.node.DiscoveryNodeUtils;
2828
import org.elasticsearch.cluster.node.DiscoveryNodes;
29-
import org.elasticsearch.cluster.project.ProjectResolver;
30-
import org.elasticsearch.cluster.project.TestProjectResolvers;
3129
import org.elasticsearch.cluster.service.ClusterService;
3230
import org.elasticsearch.common.settings.ClusterSettings;
3331
import org.elasticsearch.common.settings.Settings;
@@ -91,18 +89,16 @@ public void createRegistryAndClient() {
9189
threadPool = new TestThreadPool(this.getClass().getName());
9290
client = new VerifyingClient(threadPool);
9391
ClusterService clusterService = ClusterServiceUtils.createClusterService(threadPool, clusterSettings);
94-
ProjectResolver projectResolver = TestProjectResolvers.mustExecuteFirst();
9592
stackTemplateRegistryAccessor = new StackTemplateRegistryAccessor(
96-
new StackTemplateRegistry(Settings.EMPTY, clusterService, threadPool, client, NamedXContentRegistry.EMPTY, projectResolver)
93+
new StackTemplateRegistry(Settings.EMPTY, clusterService, threadPool, client, NamedXContentRegistry.EMPTY)
9794
);
9895

9996
apmIndexTemplateRegistry = new APMIndexTemplateRegistry(
10097
Settings.EMPTY,
10198
clusterService,
10299
threadPool,
103100
client,
104-
NamedXContentRegistry.EMPTY,
105-
projectResolver
101+
NamedXContentRegistry.EMPTY
106102
);
107103
apmIndexTemplateRegistry.setEnabled(true);
108104
}

‎x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/core/template/IndexTemplateRegistryRolloverIT.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import org.elasticsearch.cluster.ClusterState;
1919
import org.elasticsearch.cluster.metadata.DataStream;
2020
import org.elasticsearch.cluster.metadata.ProjectId;
21-
import org.elasticsearch.cluster.project.TestProjectResolvers;
2221
import org.elasticsearch.cluster.service.ClusterService;
2322
import org.elasticsearch.datastreams.DataStreamsPlugin;
2423
import org.elasticsearch.index.mapper.DateFieldMapper;
@@ -59,8 +58,7 @@ public void setup() {
5958
clusterService.threadPool(),
6059
client,
6160
xContentRegistry(),
62-
3L,
63-
TestProjectResolvers.mustExecuteFirst()
61+
3L
6462
);
6563
registry.initialize();
6664
ensureGreen();

‎x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/core/template/RolloverEnabledTestTemplateRegistry.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
import org.elasticsearch.client.internal.Client;
1111
import org.elasticsearch.cluster.metadata.ComposableIndexTemplate;
12-
import org.elasticsearch.cluster.project.ProjectResolver;
1312
import org.elasticsearch.cluster.service.ClusterService;
1413
import org.elasticsearch.common.settings.Settings;
1514
import org.elasticsearch.threadpool.ThreadPool;
@@ -29,10 +28,9 @@ public RolloverEnabledTestTemplateRegistry(
2928
ThreadPool threadPool,
3029
Client client,
3130
NamedXContentRegistry xContentRegistry,
32-
long version,
33-
ProjectResolver projectResolver
31+
long version
3432
) {
35-
super(nodeSettings, clusterService, threadPool, client, xContentRegistry, projectResolver);
33+
super(nodeSettings, clusterService, threadPool, client, xContentRegistry);
3634
this.version = version;
3735
}
3836

‎x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/template/IndexTemplateRegistry.java‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import org.elasticsearch.cluster.metadata.ProjectMetadata;
3535
import org.elasticsearch.cluster.metadata.Template;
3636
import org.elasticsearch.cluster.node.DiscoveryNode;
37-
import org.elasticsearch.cluster.project.ProjectResolver;
3837
import org.elasticsearch.cluster.service.ClusterService;
3938
import org.elasticsearch.common.Strings;
4039
import org.elasticsearch.common.regex.Regex;
@@ -94,23 +93,20 @@ public abstract class IndexTemplateRegistry implements ClusterStateListener {
9493
protected final ConcurrentMap<ProjectId, ConcurrentHashMap<String, AtomicBoolean>> pipelineCreationsInProgress =
9594
new ConcurrentHashMap<>();
9695
protected final List<LifecyclePolicy> lifecyclePolicies;
97-
protected final ProjectResolver projectResolver;
9896

9997
@SuppressWarnings("this-escape")
10098
public IndexTemplateRegistry(
10199
Settings nodeSettings,
102100
ClusterService clusterService,
103101
ThreadPool threadPool,
104102
Client client,
105-
NamedXContentRegistry xContentRegistry,
106-
ProjectResolver projectResolver
103+
NamedXContentRegistry xContentRegistry
107104
) {
108105
this.settings = nodeSettings;
109106
this.client = client;
110107
this.threadPool = threadPool;
111108
this.xContentRegistry = xContentRegistry;
112109
this.clusterService = clusterService;
113-
this.projectResolver = projectResolver;
114110
if (isDataStreamsLifecycleOnlyMode(clusterService.getSettings()) == false) {
115111
this.lifecyclePolicies = getLifecycleConfigs().stream()
116112
.map(config -> config.load(LifecyclePolicyConfig.DEFAULT_X_CONTENT_REGISTRY))
@@ -507,7 +503,7 @@ public void onFailure(Exception e) {
507503
onPutTemplateFailure(templateName, e);
508504
}
509505
},
510-
projectResolver.projectClient(client, projectId).admin().indices()::putTemplate
506+
client.projectClient(projectId).admin().indices()::putTemplate
511507
);
512508
});
513509
}
@@ -545,8 +541,7 @@ public void onFailure(Exception e) {
545541
onPutTemplateFailure(templateName, e);
546542
}
547543
},
548-
(req, listener) -> projectResolver.projectClient(client, projectId)
549-
.execute(PutComponentTemplateAction.INSTANCE, req, listener)
544+
(req, listener) -> client.projectClient(projectId).execute(PutComponentTemplateAction.INSTANCE, req, listener)
550545
);
551546
});
552547
}
@@ -591,8 +586,7 @@ public void onFailure(Exception e) {
591586
onPutTemplateFailure(templateName, e);
592587
}
593588
},
594-
(req, listener) -> projectResolver.projectClient(client, project.id())
595-
.execute(TransportPutComposableIndexTemplateAction.TYPE, req, listener)
589+
(req, listener) -> client.projectClient(project.id()).execute(TransportPutComposableIndexTemplateAction.TYPE, req, listener)
596590
);
597591
});
598592
}
@@ -662,7 +656,7 @@ public void onFailure(Exception e) {
662656
onPutPolicyFailure(policy, e);
663657
}
664658
},
665-
(req, listener) -> projectResolver.projectClient(client, projectId).execute(ILMActions.PUT, req, listener)
659+
(req, listener) -> client.projectClient(projectId).execute(ILMActions.PUT, req, listener)
666660
);
667661
});
668662
}
@@ -776,7 +770,7 @@ public void onFailure(Exception e) {
776770
onPutPipelineFailure(pipelineConfig.getId(), e);
777771
}
778772
},
779-
(req, listener) -> projectResolver.projectClient(client, projectId).execute(PutPipelineTransportAction.TYPE, req, listener)
773+
(req, listener) -> client.projectClient(projectId).execute(PutPipelineTransportAction.TYPE, req, listener)
780774
);
781775
});
782776
}
@@ -851,7 +845,7 @@ public void onFailure(Exception e) {
851845
getOrigin(),
852846
request,
853847
groupedActionListener,
854-
(req, listener) -> projectResolver.projectClient(client, project.id()).execute(RolloverAction.INSTANCE, req, listener)
848+
(req, listener) -> client.projectClient(project.id()).execute(RolloverAction.INSTANCE, req, listener)
855849
);
856850
}
857851
});

‎x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/template/YamlTemplateRegistry.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import org.elasticsearch.client.internal.Client;
1414
import org.elasticsearch.cluster.metadata.ComponentTemplate;
1515
import org.elasticsearch.cluster.metadata.ComposableIndexTemplate;
16-
import org.elasticsearch.cluster.project.ProjectResolver;
1716
import org.elasticsearch.cluster.service.ClusterService;
1817
import org.elasticsearch.common.settings.Settings;
1918
import org.elasticsearch.common.xcontent.XContentHelper;
@@ -55,10 +54,9 @@ public YamlTemplateRegistry(
5554
ClusterService clusterService,
5655
ThreadPool threadPool,
5756
Client client,
58-
NamedXContentRegistry xContentRegistry,
59-
ProjectResolver projectResolver
57+
NamedXContentRegistry xContentRegistry
6058
) {
61-
this(nodeSettings, clusterService, threadPool, client, xContentRegistry, ignored -> true, projectResolver);
59+
this(nodeSettings, clusterService, threadPool, client, xContentRegistry, ignored -> true);
6260
}
6361

6462
@SuppressWarnings({ "unchecked", "this-escape" })
@@ -68,10 +66,9 @@ public YamlTemplateRegistry(
6866
ThreadPool threadPool,
6967
Client client,
7068
NamedXContentRegistry xContentRegistry,
71-
Predicate<String> templateFilter,
72-
ProjectResolver projectResolver
69+
Predicate<String> templateFilter
7370
) {
74-
super(nodeSettings, clusterService, threadPool, client, xContentRegistry, projectResolver);
71+
super(nodeSettings, clusterService, threadPool, client, xContentRegistry);
7572
try {
7673
final Map<String, Object> resources = XContentHelper.convertToMap(
7774
YamlXContent.yamlXContent,

0 commit comments

Comments
 (0)