logging for readercontext

ywangd · Oct 9, 2024 · 3b37f43 · 3b37f43
1 parent fb482f8
commit 3b37f43
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 5 deletions.
diff --git a/server/src/main/java/org/elasticsearch/action/support/PlainActionFuture.java b/server/src/main/java/org/elasticsearch/action/support/PlainActionFuture.java
@@ -39,7 +39,7 @@ public void onResponse(@Nullable T result) {
 
     @Override
     public void onFailure(Exception e) {
-        assert assertCompleteAllowed();
+        // assert assertCompleteAllowed();
         if (sync.setException(Objects.requireNonNull(e))) {
             done(false);
         }

diff --git a/server/src/main/java/org/elasticsearch/search/SearchService.java b/server/src/main/java/org/elasticsearch/search/SearchService.java
@@ -476,6 +476,7 @@ protected void putReaderContext(ReaderContext context) {
         final Index index = context.indexShard().shardId().getIndex();
         if (indicesService.hasIndex(index) == false) {
             removeReaderContext(id);
+            logger.info("--> immediately removed readerContext [{}]", context.toString());
             throw new IndexNotFoundException(index);
         }
     }

diff --git a/server/src/main/java/org/elasticsearch/search/internal/ReaderContext.java b/server/src/main/java/org/elasticsearch/search/internal/ReaderContext.java
@@ -73,6 +73,11 @@ public ReaderContext(
         this.refCounted = AbstractRefCounted.of(this::doClose);
     }
 
+    @Override
+    public String toString() {
+        return "ReaderContext{" + "id=" + id + ", indexShard=" + indexShard.shardId() + '}';
+    }
+
     public void validate(TransportRequest request) {
         indexShard.getSearchOperationListener().validateReaderContext(this, request);
     }

diff --git a/...mework/src/main/java/org/elasticsearch/common/logging/TestThreadInfoPatternConverter.java b/...mework/src/main/java/org/elasticsearch/common/logging/TestThreadInfoPatternConverter.java
@@ -59,7 +59,7 @@ static String threadInfo(String threadName) {
         Matcher m = ELASTICSEARCH_THREAD_NAME_PATTERN.matcher(threadName);
         if (m.matches()) {
             // Thread looks like a node thread so use the node name
-            return m.group(1);
+            return threadName.substring(13); // m.group(1);
         }
         m = TEST_THREAD_NAME_PATTERN.matcher(threadName);
         if (m.matches()) {

diff --git a/test/framework/src/main/java/org/elasticsearch/search/MockSearchService.java b/test/framework/src/main/java/org/elasticsearch/search/MockSearchService.java
@@ -16,6 +16,8 @@
 import org.elasticsearch.indices.ExecutorSelector;
 import org.elasticsearch.indices.IndicesService;
 import org.elasticsearch.indices.breaker.CircuitBreakerService;
+import org.elasticsearch.logging.LogManager;
+import org.elasticsearch.logging.Logger;
 import org.elasticsearch.node.MockNode;
 import org.elasticsearch.node.ResponseCollectorService;
 import org.elasticsearch.plugins.Plugin;
@@ -36,6 +38,8 @@
 import java.util.function.Function;
 
 public class MockSearchService extends SearchService {
+    private static final Logger logger = LogManager.getLogger(MockSearchService.class);
+
     /**
      * Marker plugin used by {@link MockNode} to enable {@link MockSearchService}.
      */
@@ -54,11 +58,14 @@ public static class TestPlugin extends Plugin {}
     public static void assertNoInFlightContext() {
         final Map<ReaderContext, Throwable> copy = new HashMap<>(ACTIVE_SEARCH_CONTEXTS);
         if (copy.isEmpty() == false) {
+            final Map.Entry<ReaderContext, Throwable> entry = copy.entrySet().iterator().next();
             throw new AssertionError(
                 "There are still ["
                     + copy.size()
-                    + "] in-flight contexts. The first one's creation site is listed as the cause of this exception.",
-                copy.values().iterator().next()
+                    + "] in-flight contexts. The first one's ("
+                    + entry.getKey().toString()
+                    + ") creation site is listed as the cause of this exception.",
+                entry.getValue()
             );
         }
     }
@@ -67,14 +74,17 @@ public static void assertNoInFlightContext() {
      * Add an active search context to the list of tracked contexts. Package private for testing.
      */
     static void addActiveContext(ReaderContext context) {
-        ACTIVE_SEARCH_CONTEXTS.put(context, new RuntimeException(context.toString()));
+        final String contextString = context.toString();
+        ACTIVE_SEARCH_CONTEXTS.put(context, new RuntimeException(contextString));
+        logger.info("--> addActiveContext [{}]", contextString);
     }
 
     /**
      * Clear an active search context from the list of tracked contexts. Package private for testing.
      */
     static void removeActiveContext(ReaderContext context) {
         ACTIVE_SEARCH_CONTEXTS.remove(context);
+        logger.info("--> removeActiveContext [{}]", context.toString());
     }
 
     public MockSearchService(