@@ -102,11 +102,11 @@ public void testBasic() throws Exception {
102102 for (int i = 0 ; i < pages .length ; i ++) {
103103 pages [i ] = new Page (blockFactory .newConstantIntBlockWith (i , 2 ));
104104 }
105- ExchangeSinkHandler sinkExchanger = new ExchangeSinkHandler (blockFactory , 2 , threadPool .relativeTimeInMillisSupplier ());
105+ ExchangeSinkHandler sinkExchanger = new ExchangeSinkHandler ("test" , blockFactory , 2 , threadPool .relativeTimeInMillisSupplier ());
106106 AtomicInteger pagesAddedToSink = new AtomicInteger ();
107107 ExchangeSink sink1 = sinkExchanger .createExchangeSink (pagesAddedToSink ::incrementAndGet );
108108 ExchangeSink sink2 = sinkExchanger .createExchangeSink (pagesAddedToSink ::incrementAndGet );
109- ExchangeSourceHandler sourceExchanger = new ExchangeSourceHandler (3 , threadPool .executor (ESQL_TEST_EXECUTOR ));
109+ ExchangeSourceHandler sourceExchanger = new ExchangeSourceHandler ("test" , 3 , threadPool .executor (ESQL_TEST_EXECUTOR ));
110110 ExchangeSource source = sourceExchanger .createExchangeSource ();
111111 AtomicInteger pagesAddedToSource = new AtomicInteger ();
112112 PlainActionFuture <Void > remoteSinkFuture = new PlainActionFuture <>();
@@ -358,7 +358,7 @@ private static Driver createDriver(
358358
359359 public void testConcurrentWithHandlers () {
360360 BlockFactory blockFactory = blockFactory ();
361- var sourceExchanger = new ExchangeSourceHandler (randomExchangeBuffer (), threadPool .executor (ESQL_TEST_EXECUTOR ));
361+ var sourceExchanger = new ExchangeSourceHandler ("test" , randomExchangeBuffer (), threadPool .executor (ESQL_TEST_EXECUTOR ));
362362 PlainActionFuture <Void > remoteSinksFuture = new PlainActionFuture <>();
363363 try (RefCountingListener refs = new RefCountingListener (remoteSinksFuture )) {
364364 List <ExchangeSinkHandler > sinkHandlers = new ArrayList <>();
@@ -367,7 +367,12 @@ public void testConcurrentWithHandlers() {
367367 if (sinkHandlers .isEmpty () == false && randomBoolean ()) {
368368 sinkHandler = randomFrom (sinkHandlers );
369369 } else {
370- sinkHandler = new ExchangeSinkHandler (blockFactory , randomExchangeBuffer (), threadPool .relativeTimeInMillisSupplier ());
370+ sinkHandler = new ExchangeSinkHandler (
371+ "test" ,
372+ blockFactory ,
373+ randomExchangeBuffer (),
374+ threadPool .relativeTimeInMillisSupplier ()
375+ );
371376 sourceExchanger .addRemoteSink (
372377 sinkHandler ::fetchPageAsync ,
373378 randomBoolean (),
@@ -396,7 +401,7 @@ public void testConcurrentWithHandlers() {
396401
397402 public void testExchangeSourceContinueOnFailure () {
398403 BlockFactory blockFactory = blockFactory ();
399- var exchangeSourceHandler = new ExchangeSourceHandler (randomExchangeBuffer (), threadPool .executor (ESQL_TEST_EXECUTOR ));
404+ var exchangeSourceHandler = new ExchangeSourceHandler ("test" , randomExchangeBuffer (), threadPool .executor (ESQL_TEST_EXECUTOR ));
400405 final int maxInputSeqNo = rarely () ? -1 : randomIntBetween (0 , 50_000 );
401406 final int maxOutputSeqNo = rarely () ? -1 : randomIntBetween (0 , 50_000 );
402407 Set <Integer > expectedSeqNos = ConcurrentCollections .newConcurrentSet ();
@@ -407,7 +412,12 @@ public void testExchangeSourceContinueOnFailure() {
407412 PlainActionFuture <Void > remoteSinksFuture = new PlainActionFuture <>();
408413 try (RefCountingListener refs = new RefCountingListener (remoteSinksFuture )) {
409414 Supplier <ExchangeSink > exchangeSink = () -> {
410- var sinkHandler = new ExchangeSinkHandler (blockFactory , randomExchangeBuffer (), threadPool .relativeTimeInMillisSupplier ());
415+ var sinkHandler = new ExchangeSinkHandler (
416+ "test" ,
417+ blockFactory ,
418+ randomExchangeBuffer (),
419+ threadPool .relativeTimeInMillisSupplier ()
420+ );
411421 int failAfter = randomBoolean () ? Integer .MAX_VALUE : randomIntBetween (0 , 100 );
412422 AtomicInteger fetched = new AtomicInteger ();
413423 int instance = randomIntBetween (1 , 3 );
@@ -472,7 +482,7 @@ public void testClosingSinks() {
472482 IntBlock block2 = blockFactory .newConstantIntBlockWith (1 , 2 );
473483 Page p1 = new Page (block1 );
474484 Page p2 = new Page (block2 );
475- ExchangeSinkHandler sinkExchanger = new ExchangeSinkHandler (blockFactory , 2 , threadPool .relativeTimeInMillisSupplier ());
485+ ExchangeSinkHandler sinkExchanger = new ExchangeSinkHandler ("test" , blockFactory , 2 , threadPool .relativeTimeInMillisSupplier ());
476486 ExchangeSink sink = sinkExchanger .createExchangeSink (() -> {});
477487 sink .addPage (p1 );
478488 sink .addPage (p2 );
@@ -487,7 +497,7 @@ public void testClosingSinks() {
487497 }
488498
489499 public void testFinishEarly () throws Exception {
490- ExchangeSourceHandler sourceHandler = new ExchangeSourceHandler (20 , threadPool .generic ());
500+ ExchangeSourceHandler sourceHandler = new ExchangeSourceHandler ("test" , 20 , threadPool .generic ());
491501 Semaphore permits = new Semaphore (between (1 , 5 ));
492502 BlockFactory blockFactory = blockFactory ();
493503 Queue <Page > pages = ConcurrentCollections .newQueue ();
@@ -558,7 +568,7 @@ public void testConcurrentWithTransportActions() {
558568 try (exchange0 ; exchange1 ; node0 ; node1 ) {
559569 String exchangeId = "exchange" ;
560570 Task task = new Task (1 , "" , "" , "" , null , Collections .emptyMap ());
561- var sourceHandler = new ExchangeSourceHandler (randomExchangeBuffer (), threadPool .executor (ESQL_TEST_EXECUTOR ));
571+ var sourceHandler = new ExchangeSourceHandler (exchangeId , randomExchangeBuffer (), threadPool .executor (ESQL_TEST_EXECUTOR ));
562572 ExchangeSinkHandler sinkHandler = exchange1 .createSinkHandler (exchangeId , randomExchangeBuffer ());
563573 Transport .Connection connection = node0 .getConnection (node1 .getLocalNode ());
564574 sourceHandler .addRemoteSink (
@@ -628,7 +638,7 @@ public void sendResponse(TransportResponse transportResponse) {
628638 try (exchange0 ; exchange1 ; node0 ; node1 ) {
629639 String exchangeId = "exchange" ;
630640 Task task = new Task (1 , "" , "" , "" , null , Collections .emptyMap ());
631- var sourceHandler = new ExchangeSourceHandler (randomIntBetween (1 , 128 ), threadPool .executor (ESQL_TEST_EXECUTOR ));
641+ var sourceHandler = new ExchangeSourceHandler (exchangeId , randomIntBetween (1 , 128 ), threadPool .executor (ESQL_TEST_EXECUTOR ));
632642 ExchangeSinkHandler sinkHandler = exchange1 .createSinkHandler (exchangeId , randomIntBetween (1 , 128 ));
633643 Transport .Connection connection = node0 .getConnection (node1 .getLocalNode ());
634644 PlainActionFuture <Void > remoteSinkFuture = new PlainActionFuture <>();
@@ -662,7 +672,7 @@ public void sendResponse(TransportResponse transportResponse) {
662672 public void testNoCyclicException () throws Exception {
663673 PlainActionFuture <Void > future = new PlainActionFuture <>();
664674 try (EsqlRefCountingListener refs = new EsqlRefCountingListener (future )) {
665- var exchangeSourceHandler = new ExchangeSourceHandler (between (10 , 100 ), threadPool .generic ());
675+ var exchangeSourceHandler = new ExchangeSourceHandler ("test" , between (10 , 100 ), threadPool .generic ());
666676 int numSinks = between (5 , 10 );
667677 for (int i = 0 ; i < numSinks ; i ++) {
668678 RemoteSink remoteSink = (allSourcesFinished , listener ) -> threadPool .schedule (
0 commit comments