diff --git a/.idea/runConfigurations/Debug_OpenSearch.xml b/.idea/runConfigurations/Debug_OpenSearch.xml
index 0d8bf59823acf..2e167812615e1 100644
--- a/.idea/runConfigurations/Debug_OpenSearch.xml
+++ b/.idea/runConfigurations/Debug_OpenSearch.xml
@@ -8,4 +8,4 @@
-
+
\ No newline at end of file
diff --git a/server/src/main/java/org/opensearch/action/search/SearchCoordinatorStats.java b/server/src/main/java/org/opensearch/action/search/SearchCoordinatorStats.java
index 66556f5587174..fc4302c56774f 100644
--- a/server/src/main/java/org/opensearch/action/search/SearchCoordinatorStats.java
+++ b/server/src/main/java/org/opensearch/action/search/SearchCoordinatorStats.java
@@ -22,10 +22,6 @@
public final class SearchCoordinatorStats implements SearchRequestOperationsListener {
public StatsHolder totalStats = new StatsHolder();
- // private final CounterMetric openContexts = new CounterMetric();
-
- // private volatile Map groupStats = emptyMap();
-
@Inject
public SearchCoordinatorStats() {}
@@ -89,18 +85,18 @@ public long getExpandSearchTotal() {
return totalStats.expandSearchTotal.count();
}
- private void computeStats(SearchPhaseContext searchPhaseContext, Consumer consumer) {
+ private void computeStats(Consumer consumer) {
consumer.accept(totalStats);
}
@Override
public void onDFSPreQueryPhaseStart(SearchPhaseContext context) {
- computeStats(context, statsHolder -> { statsHolder.dfsPreQueryCurrent.inc(); });
+ computeStats(statsHolder -> { statsHolder.dfsPreQueryCurrent.inc(); });
}
@Override
public void onDFSPreQueryPhaseEnd(SearchPhaseContext context, long tookTime) {
- computeStats(context, statsHolder -> {
+ computeStats(statsHolder -> {
totalStats.dfsPreQueryCurrent.dec();
totalStats.dfsPreQueryTotal.inc();
totalStats.dfsPreQueryMetric.inc(tookTime);
@@ -109,17 +105,17 @@ public void onDFSPreQueryPhaseEnd(SearchPhaseContext context, long tookTime) {
@Override
public void onDFSPreQueryPhaseFailure(SearchPhaseContext context) {
- return;
+ computeStats(statsHolder -> { statsHolder.dfsPreQueryCurrent.dec(); });
}
@Override
public void onCanMatchPhaseStart(SearchPhaseContext context) {
- computeStats(context, statsHolder -> { statsHolder.canMatchCurrent.inc(); });
+ computeStats(statsHolder -> { statsHolder.canMatchCurrent.inc(); });
}
@Override
public void onCanMatchPhaseEnd(SearchPhaseContext context, long tookTime) {
- computeStats(context, statsHolder -> {
+ computeStats(statsHolder -> {
totalStats.canMatchCurrent.dec();
totalStats.canMatchTotal.inc();
totalStats.canMatchMetric.inc(tookTime);
@@ -128,17 +124,17 @@ public void onCanMatchPhaseEnd(SearchPhaseContext context, long tookTime) {
@Override
public void onCanMatchPhaseFailure(SearchPhaseContext context) {
- return;
+ computeStats(statsHolder -> { statsHolder.canMatchCurrent.dec(); });
}
@Override
public void onQueryPhaseStart(SearchPhaseContext context) {
- computeStats(context, statsHolder -> { statsHolder.queryCurrent.inc(); });
+ computeStats(statsHolder -> { statsHolder.queryCurrent.inc(); });
}
@Override
public void onQueryPhaseEnd(SearchPhaseContext context, long tookTime) {
- computeStats(context, statsHolder -> {
+ computeStats(statsHolder -> {
totalStats.queryCurrent.dec();
totalStats.queryTotal.inc();
totalStats.queryMetric.inc(tookTime);
@@ -147,17 +143,17 @@ public void onQueryPhaseEnd(SearchPhaseContext context, long tookTime) {
@Override
public void onQueryPhaseFailure(SearchPhaseContext context) {
- return;
+ computeStats(statsHolder -> { statsHolder.queryCurrent.dec(); });
}
@Override
public void onFetchPhaseStart(SearchPhaseContext context) {
- computeStats(context, statsHolder -> { totalStats.fetchCurrent.inc(); });
+ computeStats(statsHolder -> { totalStats.fetchCurrent.inc(); });
}
@Override
public void onFetchPhaseEnd(SearchPhaseContext context, long tookTime) {
- computeStats(context, statsHolder -> {
+ computeStats(statsHolder -> {
totalStats.fetchCurrent.dec();
totalStats.fetchTotal.inc();
totalStats.fetchMetric.inc(tookTime);
@@ -166,17 +162,17 @@ public void onFetchPhaseEnd(SearchPhaseContext context, long tookTime) {
@Override
public void onFetchPhaseFailure(SearchPhaseContext context) {
- return;
+ computeStats(statsHolder -> { totalStats.fetchCurrent.dec(); });
}
@Override
public void onExpandSearchPhaseStart(SearchPhaseContext context) {
- computeStats(context, statsHolder -> { totalStats.expandSearchCurrent.inc(); });
+ computeStats(statsHolder -> { totalStats.expandSearchCurrent.inc(); });
}
@Override
public void onExpandSearchPhaseEnd(SearchPhaseContext context, long tookTime) {
- computeStats(context, statsHolder -> {
+ computeStats(statsHolder -> {
totalStats.expandSearchCurrent.dec();
totalStats.expandSearchTotal.inc();
totalStats.expandSearchMetric.inc(tookTime);
@@ -185,7 +181,7 @@ public void onExpandSearchPhaseEnd(SearchPhaseContext context, long tookTime) {
@Override
public void onExpandSearchPhaseFailure(SearchPhaseContext context) {
- return;
+ computeStats(statsHolder -> { totalStats.expandSearchCurrent.dec(); });
}
public static final class StatsHolder {
diff --git a/server/src/main/java/org/opensearch/action/search/SearchRequestOperationsListener.java b/server/src/main/java/org/opensearch/action/search/SearchRequestOperationsListener.java
index 080e550698e1b..2d3ae2567801a 100644
--- a/server/src/main/java/org/opensearch/action/search/SearchRequestOperationsListener.java
+++ b/server/src/main/java/org/opensearch/action/search/SearchRequestOperationsListener.java
@@ -20,21 +20,6 @@
*/
public interface SearchRequestOperationsListener {
- /**
- * Executed when the request is started
- * @param context the current searchPhase context
- */
- // void onRequestStart(SearchPhaseContext context);
-
- /**
- * Executed when the request is ended
- * @param context the current searchPhase context
- */
- // void onRequestEnd(SearchPhaseContext context);
-
- /**
- * Executed when the query phase is started
- */
void onDFSPreQueryPhaseStart(SearchPhaseContext context);
void onDFSPreQueryPhaseFailure(SearchPhaseContext context);
@@ -68,7 +53,6 @@ public interface SearchRequestOperationsListener {
final class CompositeListener implements SearchRequestOperationsListener {
private final List listeners;
private final Logger logger;
- private long canMatchPhaseStart;
public CompositeListener(List listeners, Logger logger) {
this.listeners = listeners;
diff --git a/server/src/test/java/org/opensearch/action/search/AbstractSearchAsyncActionTests.java b/server/src/test/java/org/opensearch/action/search/AbstractSearchAsyncActionTests.java
index 2bafd10000a1c..28de65f2b161a 100644
--- a/server/src/test/java/org/opensearch/action/search/AbstractSearchAsyncActionTests.java
+++ b/server/src/test/java/org/opensearch/action/search/AbstractSearchAsyncActionTests.java
@@ -349,7 +349,9 @@ public void run() {
}, "message", null);
assertEquals(1, searchCoordinatorMockStats.queryPhaseFailure.get());
- SearchDfsQueryThenFetchAsyncAction searchDfsQueryThenFetchAsyncAction = createSearchDfsQueryThenFetchAsyncAction(requestOperationListeners);
+ SearchDfsQueryThenFetchAsyncAction searchDfsQueryThenFetchAsyncAction = createSearchDfsQueryThenFetchAsyncAction(
+ requestOperationListeners
+ );
searchDfsQueryThenFetchAsyncAction.start();
searchDfsQueryThenFetchAsyncAction.onPhaseFailure(new SearchPhase("test") {
@Override
@@ -358,7 +360,7 @@ public void run() {
}
}, "message", null);
assertEquals(1, searchCoordinatorMockStats.dfsPreQueryPhaseFailure.get());
-
+
FetchSearchPhase fetchPhase = createFetchSearchPhase();
ShardId shardId = new ShardId(randomAlphaOfLengthBetween(5, 10), randomAlphaOfLength(10), randomInt());
SearchShardIterator searchShardIterator = new SearchShardIterator(null, shardId, Collections.emptyList(), OriginalIndices.NONE);
@@ -596,11 +598,13 @@ public void testSearchRequestListeners() throws InterruptedException {
SearchQueryThenFetchAsyncAction action = createSearchQueryThenFetchAsyncAction(requestOperationListeners);
- SearchDfsQueryThenFetchAsyncAction searchDfsQueryThenFetchAsyncAction = createSearchDfsQueryThenFetchAsyncAction(requestOperationListeners);
+ SearchDfsQueryThenFetchAsyncAction searchDfsQueryThenFetchAsyncAction = createSearchDfsQueryThenFetchAsyncAction(
+ requestOperationListeners
+ );
CanMatchPreFilterSearchPhase canMatchPreFilterSearchPhaseAction = createCanMatchPreFilterSearchPhase(requestOperationListeners);
- long delay = (int)Math.floor(Math.random() * (5 - 1 + 1) + 1);
+ long delay = (int) Math.floor(Math.random() * (5 - 1 + 1) + 1);
action.start();
assertEquals(1, testListener.totalStats.queryCurrent.count());
TimeUnit.SECONDS.sleep(delay);
@@ -641,7 +645,9 @@ public void testSearchRequestListeners() throws InterruptedException {
assertEquals(testListener.totalStats.dfsPreQueryTotal.count(), 1);
}
- private SearchDfsQueryThenFetchAsyncAction createSearchDfsQueryThenFetchAsyncAction(List searchRequestOperationsListeners) {
+ private SearchDfsQueryThenFetchAsyncAction createSearchDfsQueryThenFetchAsyncAction(
+ List searchRequestOperationsListeners
+ ) {
SearchPhaseController controller = new SearchPhaseController(
writableRegistry(),
r -> InternalAggregationTestCase.emptyReduceContextBuilder()
@@ -685,7 +691,9 @@ private SearchDfsQueryThenFetchAsyncAction createSearchDfsQueryThenFetchAsyncAct
);
}
- private SearchQueryThenFetchAsyncAction createSearchQueryThenFetchAsyncAction(List searchRequestOperationsListeners) {
+ private SearchQueryThenFetchAsyncAction createSearchQueryThenFetchAsyncAction(
+ List searchRequestOperationsListeners
+ ) {
SearchPhaseController controller = new SearchPhaseController(
writableRegistry(),
r -> InternalAggregationTestCase.emptyReduceContextBuilder()
@@ -738,7 +746,9 @@ public void sendSearchResponse(InternalSearchResponse internalSearchResponse, At
};
}
- private CanMatchPreFilterSearchPhase createCanMatchPreFilterSearchPhase(List searchRequestOperationsListeners) {
+ private CanMatchPreFilterSearchPhase createCanMatchPreFilterSearchPhase(
+ List searchRequestOperationsListeners
+ ) {
final TransportSearchAction.SearchTimeProvider timeProvider = new TransportSearchAction.SearchTimeProvider(
0,
System.nanoTime(),