Skip to content
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

SOLR-17151 Check limits between calls to components in SearchHandler #2801

Merged
merged 6 commits into from
Nov 10, 2024
Merged

SOLR-17151 Check limits between calls to components in SearchHandler #2801

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5040e5c
Account for cases where there is no gradle.properties (i.e some build…
gus-asf Apr 15, 2024
0ba6df2
SOLR-17151 - some review feedback: spelling, fix evaluation timing of…
gus-asf Apr 15, 2024
54f57e4
Merge branch 'main' into SOLR-17151-2
gus-asf Oct 24, 2024
f8b854b
Test cases and short-circuit for all phases with loops in SearchHandler
gus-asf Oct 27, 2024
86080b0
Remove incorrect return that breaks non-limit related partial results…
gus-asf Nov 7, 2024
ca996af
Further explanation of the issues surrounding the test that had to be…
gus-asf Nov 8, 2024
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
3 changes: 3 additions & 0 deletions solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.search.CpuAllowedLimit;
import org.apache.solr.search.QueryLimits;
import org.apache.solr.search.QueryLimitsExceededException;
import org.apache.solr.search.SyntaxError;
import org.apache.solr.security.PermissionNameProvider;
import org.apache.solr.update.processor.DistributedUpdateProcessor;
Expand Down Expand Up @@ -241,6 +242,8 @@ public void handleRequest(SolrQueryRequest req, SolrQueryResponse rsp) {
metrics.numTimeouts.mark();
rsp.setHttpCaching(false);
}
} catch (QueryLimitsExceededException e) {
rsp.setPartialResults(req);
} catch (Exception e) {
Exception normalized = normalizeReceivedException(req, e);
processErrorMetricsOnException(normalized, metrics);
Expand Down
12 changes: 9 additions & 3 deletions solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,17 +615,23 @@ protected int groupedDistributedProcess(ResponseBuilder rb) {
}

protected int regularDistributedProcess(ResponseBuilder rb) {
if (rb.stage < ResponseBuilder.STAGE_PARSE_QUERY) return ResponseBuilder.STAGE_PARSE_QUERY;
if (rb.stage < ResponseBuilder.STAGE_PARSE_QUERY) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1, I never liked these one-liners.

return ResponseBuilder.STAGE_PARSE_QUERY;
}
if (rb.stage == ResponseBuilder.STAGE_PARSE_QUERY) {
createDistributedStats(rb);
return ResponseBuilder.STAGE_EXECUTE_QUERY;
}
if (rb.stage < ResponseBuilder.STAGE_EXECUTE_QUERY) return ResponseBuilder.STAGE_EXECUTE_QUERY;
if (rb.stage < ResponseBuilder.STAGE_EXECUTE_QUERY) {
return ResponseBuilder.STAGE_EXECUTE_QUERY;
}
if (rb.stage == ResponseBuilder.STAGE_EXECUTE_QUERY) {
createMainQuery(rb);
return ResponseBuilder.STAGE_GET_FIELDS;
}
if (rb.stage < ResponseBuilder.STAGE_GET_FIELDS) return ResponseBuilder.STAGE_GET_FIELDS;
if (rb.stage < ResponseBuilder.STAGE_GET_FIELDS) {
return ResponseBuilder.STAGE_GET_FIELDS;
}
if (rb.stage == ResponseBuilder.STAGE_GET_FIELDS && !rb.onePassDistributedQuery) {
createRetrieveDocs(rb);
return ResponseBuilder.STAGE_DONE;
Expand Down
12 changes: 6 additions & 6 deletions solr/core/src/java/org/apache/solr/handler/component/ResponseBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,13 +122,13 @@ public ResponseBuilder(
* public static final String LOCAL_SHARD = "local"; public static final String DOC_QUERY = "dq";
* *
*/
public static int STAGE_START = 0;
public static final int STAGE_START = 0;

public static int STAGE_PARSE_QUERY = 1000;
public static int STAGE_TOP_GROUPS = 1500;
public static int STAGE_EXECUTE_QUERY = 2000;
public static int STAGE_GET_FIELDS = 3000;
public static int STAGE_DONE = Integer.MAX_VALUE;
public static final int STAGE_PARSE_QUERY = 1000;
public static final int STAGE_TOP_GROUPS = 1500;
public static final int STAGE_EXECUTE_QUERY = 2000;
public static final int STAGE_GET_FIELDS = 3000;
public static final int STAGE_DONE = Integer.MAX_VALUE;

public int stage; // What stage is this current request at?

Expand Down
Loading
Loading