Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,11 @@ public void onFetchPhase(SearchContext searchContext, long tookInNanos) {
});
}

@Override
public void onDfsPhase(SearchContext searchContext, long tookInNanos) {
computeStats(searchContext, statsHolder -> { statsHolder.recentSearchLoad.addIncrement(tookInNanos, System.nanoTime()); });
}

private void computeStats(SearchContext searchContext, Consumer<StatsHolder> consumer) {
consumer.accept(totalStats);
var groupStats = searchContext.groupStats();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,28 @@ default void onFailedFetchPhase(SearchContext searchContext) {}
*/
default void onFetchPhase(SearchContext searchContext, long tookInNanos) {}

/**
* Executed before the DFS phase is executed
* @param searchContext the current search context
*/
default void onPreDfsPhase(SearchContext searchContext) {}

/**
* Executed after the query DFS successfully finished.
* Note: this is not invoked if the DFS phase execution failed.
* @param searchContext the current search context
* @param tookInNanos the number of nanoseconds the query execution took
*
* @see #onFailedQueryPhase(SearchContext)
*/
default void onDfsPhase(SearchContext searchContext, long tookInNanos) {}

/**
* Executed if a dfs phased failed.
* @param searchContext the current search context
*/
default void onFailedDfsPhase(SearchContext searchContext) {}

/**
* Executed when a new reader context was created
* @param readerContext the created context
Expand Down Expand Up @@ -182,6 +204,39 @@ public void onFetchPhase(SearchContext searchContext, long tookInNanos) {
}
}

@Override
public void onPreDfsPhase(SearchContext searchContext) {
for (SearchOperationListener listener : listeners) {
try {
listener.onPreDfsPhase(searchContext);
} catch (Exception e) {
logger.warn(() -> "onPreDfsPhase listener [" + listener + "] failed", e);
}
}
}

@Override
public void onFailedDfsPhase(SearchContext searchContext) {
for (SearchOperationListener listener : listeners) {
try {
listener.onFailedDfsPhase(searchContext);
} catch (Exception e) {
logger.warn(() -> "onFailedDfsPhase listener [" + listener + "] failed", e);
}
}
}

@Override
public void onDfsPhase(SearchContext searchContext, long tookInNanos) {
for (SearchOperationListener listener : listeners) {
try {
listener.onDfsPhase(searchContext, tookInNanos);
} catch (Exception e) {
logger.warn(() -> "onDfsPhase listener [" + listener + "] failed", e);
}
}
}

@Override
public void onNewReaderContext(ReaderContext readerContext) {
for (SearchOperationListener listener : listeners) {
Expand Down
13 changes: 12 additions & 1 deletion server/src/main/java/org/elasticsearch/search/SearchService.java
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,18 @@ private DfsSearchResult executeDfsPhase(ShardSearchRequest request, SearchShardT
Releasable ignored = readerContext.markAsUsed(getKeepAlive(request));
SearchContext context = createContext(readerContext, request, task, ResultsType.DFS, false)
) {
DfsPhase.execute(context);
final long beforeQueryTime = System.nanoTime();
var opsListener = context.indexShard().getSearchOperationListener();
opsListener.onPreDfsPhase(context);
try {
DfsPhase.execute(context);
opsListener.onDfsPhase(context, System.nanoTime() - beforeQueryTime);
opsListener = null;
} finally {
if (opsListener != null) {
opsListener.onFailedDfsPhase(context);
}
}
return context.dfsResult();
} catch (Exception e) {
logger.trace("Dfs phase failed", e);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,40 @@ public void setup() {
this.shardSearchStatsListener = new ShardSearchStats(searchStatsSettings);
}

public void testDfsPhase() {
try (SearchContext sc = createSearchContext(false)) {
shardSearchStatsListener.onPreDfsPhase(sc);
shardSearchStatsListener.onDfsPhase(sc, TimeUnit.MILLISECONDS.toNanos(TEN_MILLIS));

SearchStats.Stats stats = shardSearchStatsListener.stats().getTotal();
assertTrue(stats.getSearchLoadRate() > 0.0);
}
}

public void testDfsPhase_withGroups() {
try (SearchContext sc = createSearchContext(false)) {
shardSearchStatsListener.onPreDfsPhase(sc);
shardSearchStatsListener.onDfsPhase(sc, TimeUnit.MILLISECONDS.toNanos(TEN_MILLIS));

SearchStats searchStats = shardSearchStatsListener.stats("_all");
SearchStats.Stats stats = shardSearchStatsListener.stats().getTotal();
assertTrue(stats.getSearchLoadRate() > 0.0);

stats = Objects.requireNonNull(searchStats.getGroupStats()).get("group1");
assertTrue(stats.getSearchLoadRate() > 0.0);
}
}

public void testDfsPhase_Failure() {
try (SearchContext sc = createSearchContext(false)) {
shardSearchStatsListener.onPreDfsPhase(sc);
shardSearchStatsListener.onFailedDfsPhase(sc);

SearchStats.Stats stats = shardSearchStatsListener.stats().getTotal();
assertEquals(0.0, stats.getSearchLoadRate(), 0);
}
}

public void testQueryPhase() {
try (SearchContext sc = createSearchContext(false)) {
shardSearchStatsListener.onPreQueryPhase(sc);
Expand Down