Skip to content

Remove assertExecuteOnStartThread from AbstractSearchAsyncAction #121922

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 7, 2025
Merged

Remove assertExecuteOnStartThread from AbstractSearchAsyncAction #121922

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 0 additions & 27 deletions server/src/main/java/org/elasticsearch/action/search/AbstractSearchAsyncAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,32 +246,6 @@ void skipShard(SearchShardIterator iterator) {
successfulShardExecution();
}

private static boolean assertExecuteOnStartThread() {
// Ensure that the current code has the following stacktrace:
// AbstractSearchAsyncAction#start -> AbstractSearchAsyncAction#executePhase -> AbstractSearchAsyncAction#performPhaseOnShard
final StackTraceElement[] stackTraceElements = Thread.currentThread().getStackTrace();
assert stackTraceElements.length >= 6 : stackTraceElements;
int index = 0;
assert stackTraceElements[index++].getMethodName().equals("getStackTrace");
assert stackTraceElements[index++].getMethodName().equals("assertExecuteOnStartThread");
assert stackTraceElements[index++].getMethodName().equals("failOnUnavailable");
if (stackTraceElements[index].getMethodName().equals("performPhaseOnShard")) {
assert stackTraceElements[index].getClassName().endsWith("CanMatchPreFilterSearchPhase");
index++;
}
assert stackTraceElements[index].getClassName().endsWith("AbstractSearchAsyncAction");
assert stackTraceElements[index++].getMethodName().equals("run");

assert stackTraceElements[index].getClassName().endsWith("AbstractSearchAsyncAction");
assert stackTraceElements[index++].getMethodName().equals("executePhase");

assert stackTraceElements[index].getClassName().endsWith("AbstractSearchAsyncAction");
assert stackTraceElements[index++].getMethodName().equals("start");

assert stackTraceElements[index].getClassName().endsWith("AbstractSearchAsyncAction") == false;
return true;
}

private void performPhaseOnShard(final int shardIndex, final SearchShardIterator shardIt, final SearchShardTarget shard) {
if (throttleConcurrentRequests) {
var pendingExecutions = pendingExecutionsPerNode.computeIfAbsent(
Expand Down Expand Up @@ -313,7 +287,6 @@ public void onFailure(Exception e) {
}

private void failOnUnavailable(int shardIndex, SearchShardIterator shardIt) {
assert assertExecuteOnStartThread();
SearchShardTarget unassignedShard = new SearchShardTarget(null, shardIt.shardId(), shardIt.getClusterAlias());
onShardFailure(shardIndex, unassignedShard, shardIt, new NoShardAvailableActionException(shardIt.shardId()));
}
Expand Down