Skip to content

Commit 4b5d66a

Browse files
ywangdywangd
committed
tidy up projectResolver usage
1 parent 266bd8b commit 4b5d66a

2 files changed

Lines changed: 27 additions & 32 deletions

File tree

‎server/src/test/java/org/elasticsearch/snapshots/SnapshotResiliencyTestHelper.java‎

Lines changed: 23 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@
6969
import org.elasticsearch.cluster.node.DiscoveryNodeRole;
7070
import org.elasticsearch.cluster.node.DiscoveryNodeUtils;
7171
import org.elasticsearch.cluster.node.DiscoveryNodes;
72-
import org.elasticsearch.cluster.project.DefaultProjectResolver;
7372
import org.elasticsearch.cluster.project.ProjectResolver;
7473
import org.elasticsearch.cluster.project.TestProjectResolvers;
7574
import org.elasticsearch.cluster.routing.BatchedRerouteService;
@@ -179,7 +178,6 @@
179178
import static org.elasticsearch.test.ESTestCase.randomAlphaOfLength;
180179
import static org.elasticsearch.test.ESTestCase.randomFrom;
181180
import static org.elasticsearch.test.ESTestCase.randomLongBetween;
182-
import static org.elasticsearch.test.ESTestCase.randomProjectIdOrDefault;
183181
import static org.mockito.Mockito.mock;
184182

185183
public class SnapshotResiliencyTestHelper {
@@ -475,7 +473,7 @@ public TestClusterNode(DiscoveryNode node, TransportInterceptorFactory transport
475473
this.pluginsService = createPluginsService(settings, environment);
476474
this.threadPool = deterministicTaskQueue.getThreadPool(runnable -> DeterministicTaskQueue.onNodeLog(this.node, runnable));
477475
this.masterService = new FakeThreadPoolMasterService(node.getName(), threadPool, deterministicTaskQueue::scheduleNow);
478-
this.client = new NodeClient(settings, threadPool, TestProjectResolvers.alwaysThrow());
476+
this.client = new NodeClient(settings, threadPool, projectResolver);
479477
this.usageService = new UsageService();
480478
}
481479

@@ -565,8 +563,7 @@ public RecyclerBytesStreamOutput newNetworkBytesStream() {
565563
null,
566564
emptySet()
567565
);
568-
// TODO: The indexNameExpressionResolver does not use the same threadContext and projectResolver
569-
indexNameExpressionResolver = TestIndexNameExpressionResolver.newInstance();
566+
indexNameExpressionResolver = TestIndexNameExpressionResolver.newInstance(threadPool.getThreadContext(), projectResolver);
570567
bigArrays = new BigArrays(new PageCacheRecycler(settings), null, "test");
571568
repositoriesService = new RepositoriesService(
572569
settings,
@@ -602,13 +599,7 @@ public RecyclerBytesStreamOutput newNetworkBytesStream() {
602599
);
603600
nodeEnv = new NodeEnvironment(settings, environment);
604601
final NamedXContentRegistry namedXContentRegistry = new NamedXContentRegistry(Collections.emptyList());
605-
final ScriptService scriptService = new ScriptService(
606-
settings,
607-
emptyMap(),
608-
emptyMap(),
609-
() -> 1L,
610-
TestProjectResolvers.singleProject(randomProjectIdOrDefault())
611-
);
602+
final ScriptService scriptService = new ScriptService(settings, emptyMap(), emptyMap(), () -> 1L, projectResolver);
612603

613604
final SetOnce<RerouteService> rerouteServiceSetOnce = new SetOnce<>();
614605
final SnapshotsInfoService snapshotsInfoService = new InternalSnapshotsInfoService(
@@ -659,7 +650,7 @@ public RecyclerBytesStreamOutput newNetworkBytesStream() {
659650
.bigArrays(bigArrays)
660651
.scriptService(scriptService)
661652
.clusterService(clusterService)
662-
.projectResolver(DefaultProjectResolver.INSTANCE)
653+
.projectResolver(projectResolver)
663654
.client(client)
664655
.metaStateService(new MetaStateService(nodeEnv, namedXContentRegistry))
665656
.mapperMetrics(MapperMetrics.NOOP)
@@ -701,7 +692,7 @@ public RecyclerBytesStreamOutput newNetworkBytesStream() {
701692
threadPool,
702693
clusterService,
703694
repositoriesService,
704-
TestProjectResolvers.DEFAULT_PROJECT_ONLY
695+
projectResolver
705696
)
706697
);
707698
actions.put(
@@ -773,7 +764,7 @@ public RecyclerBytesStreamOutput newNetworkBytesStream() {
773764
actionFilters,
774765
new IndexingPressure(settings),
775766
EmptySystemIndices.INSTANCE,
776-
TestProjectResolvers.DEFAULT_PROJECT_ONLY
767+
projectResolver
777768
)
778769
),
779770
RetentionLeaseSyncer.EMPTY,
@@ -803,7 +794,7 @@ public RecyclerBytesStreamOutput newNetworkBytesStream() {
803794
metadataCreateIndexService,
804795
actionFilters,
805796
EmptySystemIndices.INSTANCE,
806-
DefaultProjectResolver.INSTANCE
797+
projectResolver
807798
)
808799
);
809800
final MappingUpdatedAction mappingUpdatedAction = new MappingUpdatedAction(settings, clusterSettings);
@@ -825,7 +816,7 @@ public RecyclerBytesStreamOutput newNetworkBytesStream() {
825816
client,
826817
null,
827818
FailureStoreMetrics.NOOP,
828-
TestProjectResolvers.alwaysThrow(),
819+
projectResolver,
829820
new FeatureService(List.of()) {
830821
@Override
831822
public boolean clusterHasFeature(ClusterState state, NodeFeature feature) {
@@ -839,7 +830,7 @@ public boolean clusterHasFeature(ClusterState state, NodeFeature feature) {
839830
indexNameExpressionResolver,
840831
new IndexingPressure(settings),
841832
EmptySystemIndices.INSTANCE,
842-
TestProjectResolvers.DEFAULT_PROJECT_ONLY,
833+
projectResolver,
843834
FailureStoreMetrics.NOOP,
844835
DataStreamFailureStoreSettings.create(ClusterSettings.createBuiltInClusterSettings()),
845836
new FeatureService(List.of()) {
@@ -863,7 +854,7 @@ public boolean clusterHasFeature(ClusterState state, NodeFeature feature) {
863854
actionFilters,
864855
indexingMemoryLimits,
865856
EmptySystemIndices.INSTANCE,
866-
TestProjectResolvers.DEFAULT_PROJECT_ONLY,
857+
projectResolver,
867858
DocumentParsingProvider.EMPTY_INSTANCE
868859
);
869860
actions.put(TransportShardBulkAction.TYPE, transportShardBulkAction);
@@ -900,7 +891,7 @@ public boolean clusterHasFeature(ClusterState state, NodeFeature feature) {
900891
indexNameExpressionResolver,
901892
new RequestValidators<>(Collections.emptyList()),
902893
EmptySystemIndices.INSTANCE,
903-
TestProjectResolvers.DEFAULT_PROJECT_ONLY
894+
projectResolver
904895
)
905896
);
906897
actions.put(
@@ -911,7 +902,7 @@ public boolean clusterHasFeature(ClusterState state, NodeFeature feature) {
911902
threadPool,
912903
metadataMappingService,
913904
actionFilters,
914-
TestProjectResolvers.DEFAULT_PROJECT_ONLY,
905+
projectResolver,
915906
EmptySystemIndices.INSTANCE
916907
)
917908
);
@@ -929,7 +920,7 @@ public boolean clusterHasFeature(ClusterState state, NodeFeature feature) {
929920
searchPhaseController,
930921
clusterService,
931922
actionFilters,
932-
TestProjectResolvers.DEFAULT_PROJECT_ONLY,
923+
projectResolver,
933924
indexNameExpressionResolver,
934925
namedWriteableRegistry,
935926
EmptySystemIndices.INSTANCE.getExecutorSelector(),
@@ -946,7 +937,7 @@ public boolean clusterHasFeature(ClusterState state, NodeFeature feature) {
946937
threadPool,
947938
restoreService,
948939
actionFilters,
949-
TestProjectResolvers.DEFAULT_PROJECT_ONLY
940+
projectResolver
950941
)
951942
);
952943
actions.put(
@@ -957,7 +948,7 @@ public boolean clusterHasFeature(ClusterState state, NodeFeature feature) {
957948
threadPool,
958949
new MetadataDeleteIndexService(settings, clusterService, allocationService),
959950
actionFilters,
960-
TestProjectResolvers.DEFAULT_PROJECT_ONLY,
951+
projectResolver,
961952
indexNameExpressionResolver,
962953
new DestructiveOperations(settings, clusterSettings)
963954
)
@@ -970,7 +961,7 @@ public boolean clusterHasFeature(ClusterState state, NodeFeature feature) {
970961
repositoriesService,
971962
threadPool,
972963
actionFilters,
973-
TestProjectResolvers.DEFAULT_PROJECT_ONLY
964+
projectResolver
974965
)
975966
);
976967
actions.put(
@@ -981,7 +972,7 @@ public boolean clusterHasFeature(ClusterState state, NodeFeature feature) {
981972
repositoriesService,
982973
threadPool,
983974
actionFilters,
984-
TestProjectResolvers.DEFAULT_PROJECT_ONLY
975+
projectResolver
985976
)
986977
);
987978
actions.put(
@@ -992,7 +983,7 @@ public boolean clusterHasFeature(ClusterState state, NodeFeature feature) {
992983
threadPool,
993984
snapshotsService,
994985
actionFilters,
995-
TestProjectResolvers.DEFAULT_PROJECT_ONLY
986+
projectResolver
996987
)
997988
);
998989
actions.put(
@@ -1003,7 +994,7 @@ public boolean clusterHasFeature(ClusterState state, NodeFeature feature) {
1003994
threadPool,
1004995
snapshotsService,
1005996
actionFilters,
1006-
TestProjectResolvers.DEFAULT_PROJECT_ONLY
997+
projectResolver
1007998
)
1008999
);
10091000
actions.put(
@@ -1014,7 +1005,7 @@ public boolean clusterHasFeature(ClusterState state, NodeFeature feature) {
10141005
threadPool,
10151006
repositoriesService,
10161007
actionFilters,
1017-
TestProjectResolvers.DEFAULT_PROJECT_ONLY
1008+
projectResolver
10181009
)
10191010
);
10201011
actions.put(
@@ -1025,7 +1016,7 @@ public boolean clusterHasFeature(ClusterState state, NodeFeature feature) {
10251016
threadPool,
10261017
allocationService,
10271018
actionFilters,
1028-
TestProjectResolvers.alwaysThrow()
1019+
projectResolver
10291020
)
10301021
);
10311022
actions.put(
@@ -1036,7 +1027,7 @@ public boolean clusterHasFeature(ClusterState state, NodeFeature feature) {
10361027
threadPool,
10371028
actionFilters,
10381029
indexNameExpressionResolver,
1039-
DefaultProjectResolver.INSTANCE,
1030+
projectResolver,
10401031
new NoOpClient(threadPool)
10411032
)
10421033
);
@@ -1072,7 +1063,7 @@ public boolean clusterHasFeature(ClusterState state, NodeFeature feature) {
10721063
threadPool,
10731064
snapshotsService,
10741065
actionFilters,
1075-
TestProjectResolvers.DEFAULT_PROJECT_ONLY
1066+
projectResolver
10761067
)
10771068
);
10781069

‎test/framework/src/main/java/org/elasticsearch/indices/TestIndexNameExpressionResolver.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,8 @@ public static IndexNameExpressionResolver newInstance(ThreadContext threadContex
7474
public static IndexNameExpressionResolver newInstance(SystemIndices systemIndices, ProjectResolver projectResolver) {
7575
return new IndexNameExpressionResolver(new ThreadContext(Settings.EMPTY), systemIndices, projectResolver);
7676
}
77+
78+
public static IndexNameExpressionResolver newInstance(ThreadContext threadContext, ProjectResolver projectResolver) {
79+
return new IndexNameExpressionResolver(threadContext, EmptySystemIndices.INSTANCE, projectResolver);
80+
}
7781
}

0 commit comments

Comments
 (0)