skip can_match

Author: dnhatn

server/src/main/java/org/elasticsearch/index/shard/IndexShard.java

@@ -3173,7 +3173,7 @@ && isSearchIdle()
     /**
      * Returns true if this shards is search idle
      */
-    final boolean isSearchIdle() {
+    public final boolean isSearchIdle() {
         return (threadPool.relativeTimeInMillis() - lastSearcherAccess.get()) >= indexSettings.getSearchIdleAfter().getMillis();
     }
 

server/src/main/java/org/elasticsearch/search/SearchService.java

@@ -1113,6 +1113,9 @@ public CanMatchResponse canMatch(ShardSearchRequest request) throws IOException
         assert request.searchType() == SearchType.QUERY_THEN_FETCH : "unexpected search type: " + request.searchType();
         IndexService indexService = indicesService.indexServiceSafe(request.shardId().getIndex());
         IndexShard indexShard = indexService.getShard(request.shardId().getId());
+        if (indexShard.isSearchIdle()) {
+            return new CanMatchResponse(true, null);
+        }
         // we don't want to use the reader wrapper since it could run costly operations
         // and we can afford false positives.
         try (Engine.Searcher searcher = indexShard.acquireCanMatchSearcher()) {
@@ -1135,9 +1138,11 @@ public CanMatchResponse canMatch(ShardSearchRequest request) throws IOException
     }
 
     public void canMatch(ShardSearchRequest request, ActionListener<CanMatchResponse> listener) {
-        IndexService indexService = indicesService.indexServiceSafe(request.shardId().getIndex());
-        IndexShard indexShard = indexService.getShard(request.shardId().getId());
-        indexShard.awaitShardSearchActive(ignored -> ActionListener.completeWith(listener, () -> canMatch(request)));
+        try {
+            listener.onResponse(canMatch(request));
+        } catch (IOException e) {
+            listener.onFailure(e);
+        }
     }
 
     /**

server/src/test/java/org/elasticsearch/action/search/TransportSearchIT.java

@@ -91,7 +91,7 @@ public void testSearchIdle() throws Exception {
             for (String node : internalCluster().nodesInclude("test")) {
                 final IndicesService indicesService = internalCluster().getInstance(IndicesService.class, node);
                 for (IndexShard indexShard : indicesService.indexServiceSafe(resolveIndex("test"))) {
-                    IndexShardTestCase.isSearchIdle(indexShard);
+                    assertTrue(indexShard.isSearchIdle());
                 }
             }
         });

test/framework/src/main/java/org/elasticsearch/index/shard/IndexShardTestCase.java

@@ -877,8 +877,4 @@ public static Engine.Warmer createTestWarmer(IndexSettings indexSettings) {
             }
         };
     }
-
-    public static boolean isSearchIdle(IndexShard shard) {
-        return shard.isSearchIdle();
-    }
 }