1212import org .apache .http .nio .entity .NByteArrayEntity ;
1313import org .apache .logging .log4j .LogManager ;
1414import org .apache .lucene .util .SetOnce ;
15- import org .elasticsearch .action .admin .cluster .node .info .NodeInfo ;
16- import org .elasticsearch .action .admin .cluster .node .info .NodesInfoResponse ;
1715import org .elasticsearch .action .admin .cluster .node .tasks .list .ListTasksResponse ;
1816import org .elasticsearch .action .bulk .BulkRequestBuilder ;
1917import org .elasticsearch .action .search .MultiSearchRequest ;
4644import java .util .ArrayList ;
4745import java .util .Collection ;
4846import java .util .Collections ;
49- import java .util .HashMap ;
5047import java .util .List ;
5148import java .util .Map ;
5249import java .util .concurrent .CancellationException ;
@@ -94,7 +91,7 @@ public void testAutomaticCancellationMultiSearchDuringQueryPhase() throws Except
9491 }
9592
9693 void verifyCancellationDuringQueryPhase (String searchAction , Request searchRequest ) throws Exception {
97- Map <String , String > nodeIdToName = readNodesInfo ();
94+ Map <String , String > nodeIdToName = nodeIdsToNames ();
9895
9996 List <ScriptedBlockPlugin > plugins = initBlockFactory ();
10097 indexTestData ();
@@ -137,7 +134,7 @@ public void testAutomaticCancellationMultiSearchDuringFetchPhase() throws Except
137134 }
138135
139136 void verifyCancellationDuringFetchPhase (String searchAction , Request searchRequest ) throws Exception {
140- Map <String , String > nodeIdToName = readNodesInfo ();
137+ Map <String , String > nodeIdToName = nodeIdsToNames ();
141138
142139 List <ScriptedBlockPlugin > plugins = initBlockFactory ();
143140 indexTestData ();
@@ -153,16 +150,6 @@ void verifyCancellationDuringFetchPhase(String searchAction, Request searchReque
153150 expectThrows (CancellationException .class , future ::actionGet );
154151 }
155152
156- private static Map <String , String > readNodesInfo () {
157- Map <String , String > nodeIdToName = new HashMap <>();
158- NodesInfoResponse nodesInfoResponse = clusterAdmin ().prepareNodesInfo ().get ();
159- assertFalse (nodesInfoResponse .hasFailures ());
160- for (NodeInfo node : nodesInfoResponse .getNodes ()) {
161- nodeIdToName .put (node .getNode ().getId (), node .getNode ().getName ());
162- }
163- return nodeIdToName ;
164- }
165-
166153 private static void ensureSearchTaskIsCancelled (String transportAction , Function <String , String > nodeIdToName ) throws Exception {
167154 SetOnce <TaskInfo > searchTask = new SetOnce <>();
168155 ListTasksResponse listTasksResponse = clusterAdmin ().prepareListTasks ().get ();
0 commit comments