Give SearchContext a toString

and move the string capturing to capture time.
loggly · Apr 11, 2016 · 525ce40 · 525ce40
1 parent ac94e5f
commit 525ce40
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 18 deletions.
diff --git a/core/src/main/java/org/elasticsearch/search/internal/SearchContext.java b/core/src/main/java/org/elasticsearch/search/internal/SearchContext.java
@@ -403,4 +403,16 @@ public enum Lifetime {
 
     public abstract QueryShardContext getQueryShardContext();
 
+    @Override
+    public String toString() {
+        StringBuilder result = new StringBuilder().append(shardTarget());
+        if (searchType() != SearchType.DEFAULT) {
+            result.append("searchType=[").append(searchType()).append("]");
+        }
+        if (scrollContext() != null) {
+            result.append("scroll=[").append(scrollContext().scroll.keepAlive()).append("]");
+        }
+        result.append(" query=[").append(query()).append("]");
+        return result.toString();
+    }
 }
diff --git a/test/framework/src/main/java/org/elasticsearch/search/MockSearchService.java b/test/framework/src/main/java/org/elasticsearch/search/MockSearchService.java
@@ -19,7 +19,6 @@
 
 package org.elasticsearch.search;
 
-import org.elasticsearch.action.search.SearchType;
 import org.elasticsearch.cache.recycler.PageCacheRecycler;
 import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.inject.Inject;
@@ -62,30 +61,18 @@ public void onModule(SearchModule module) {
     public static void assertNoInFlightContext() {
         final Map<SearchContext, Throwable> copy = new HashMap<>(ACTIVE_SEARCH_CONTEXTS);
         if (copy.isEmpty() == false) {
-            Map.Entry<SearchContext, Throwable> firstOpen = copy.entrySet().iterator().next();
-            SearchContext context = firstOpen.getKey();
-            StringBuilder message = new StringBuilder().append(context.shardTarget());
-            if (context.searchType() != SearchType.DEFAULT) {
-                message.append("searchType=[").append(context.searchType()).append("]");
-            }
-            if (context.scrollContext() != null) {
-                message.append("scroll=[").append(context.scrollContext().scroll.keepAlive()).append("]");
-            }
-            message.append(" query=[").append(context.query()).append("]");
-            RuntimeException cause = new RuntimeException(message.toString());
-            cause.setStackTrace(firstOpen.getValue().getStackTrace());
             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.",
-                    cause);
+                    "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());
         }
     }
 
     /**
      * Add an active search context to the list of tracked contexts. Package private for testing.
      */
     static void addActiveContext(SearchContext context) {
-        ACTIVE_SEARCH_CONTEXTS.put(context, new RuntimeException());
+        ACTIVE_SEARCH_CONTEXTS.put(context, new RuntimeException(context.toString()));
     }
 
     /**

diff --git a/test/framework/src/test/java/org/elasticsearch/search/MockSearchServiceTests.java b/test/framework/src/test/java/org/elasticsearch/search/MockSearchServiceTests.java
@@ -53,7 +53,7 @@ public Query query() {
         MockSearchService.addActiveContext(s);
         try {
             Throwable e = expectThrows(AssertionError.class, () -> MockSearchService.assertNoInFlightContext());
-            assertEquals("There are still 1 in-flight contexts. The first one's creation site is listed as the cause of this exception.",
+            assertEquals("There are still [1] in-flight contexts. The first one's creation site is listed as the cause of this exception.",
                     e.getMessage());
             e = e.getCause();
             // The next line with throw an exception if the date looks wrong