Skip to content

SOLR-17140 - 9x backport#2284

Merged
gus-asf merged 3 commits intoapache:branch_9xfrom
gus-asf:SOLR-17140_9x
Feb 20, 2024
Merged

SOLR-17140 - 9x backport#2284
gus-asf merged 3 commits intoapache:branch_9xfrom
gus-asf:SOLR-17140_9x

Conversation

@gus-asf
Copy link
Copy Markdown
Contributor

@gus-asf gus-asf commented Feb 19, 2024

@gus-asf gus-asf requested a review from sigram February 19, 2024 18:17
@gus-asf
Copy link
Copy Markdown
Contributor Author

gus-asf commented Feb 20, 2024

The above tidy/spotless check does not reproduce locally for me. Neither running gradlew spotlessApply nor running gradlew tidy tasks produce changes. The offending file is not changed in this change list and does not have this flaw on my local machine or in the branch I am merging? https://github.com/gus-asf/solr/blob/SOLR-17140_9x/solr/core/src/test/org/apache/solr/cloud/SolrCloudExampleTest.java#L44 ... seems to be seeing this: 9b9f569 which apparently broke things. sigh Would be nice if this PR interface identified that commits had happened, even if they don't interfere with the merge. Also @epugh maybe following a PR process when back-porting would have caught this without breaking others?

gus-asf and others added 3 commits February 20, 2024 06:49
@gus-asf
SOLR-17140 - provide extensible query limit concept. (apache#2237)
79359de 
* SOLR-17140 - provide extensible query limit concept.
This replaces SolrQueryTimeoutImpl.java with a much simpler SolrTimeLimit and provides a QueryLimits class to allow addition of additional types of limits. (see also SOLR-17138)

* SOLR-17140 ensure we always have limits. SolrRequestInfo is created by HttpSolrCall, so any code path not flowing through that needs to ensure SolrRequestInfo if it wants to use limit functionality.

* SOLR-17140 Limits should not be lost if we push a new request onto the stack. This makes it difficult to change limits for sub-requests, but I'm not convinced that such a thing makes sense anyway.

(cherry picked from commit 07f6549)
@gus-asf
SOLR-17140 Account for AnalyticsHandler in 9x (not sure why it's not …
e67e372 
…in main?)
@gus-asf
SOLR-17140 not sure how this passed locally, spotless flaky?
ab4296e
@janhoy
Copy link
Copy Markdown
Contributor

janhoy commented Feb 20, 2024

I cannot reproduce either, strange. Maybe open a new JIRA for that precommit failure and proceed with this one?

@gus-asf
Copy link
Copy Markdown
Contributor Author

gus-asf commented Feb 20, 2024

I cannot reproduce either, strange. Maybe open a new JIRA for that precommit failure and proceed with this one?

I figured it out @epugh pushed stuff while I was working, and has since pushed a fix. Concurrency issues. There's also a broken PostTool test now (locally), but I'm pretty clear that this isn't my issue so I'll just merge this through so long as the latest run doesn't fail on anything else.

sigram
sigram approved these changes Feb 20, 2024
View reviewed changes
Copy link
Copy Markdown
Contributor

@sigram sigram left a comment

Choose a reason for hiding this comment

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

LGTM.

@gus-asf gus-asf merged commit b06495c into apache:branch_9x Feb 20, 2024
@epugh
Copy link
Copy Markdown
Contributor

epugh commented Feb 20, 2024

I am working on unmessing up branch_9x with post tool.. Sigh....

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sigram sigram sigram approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@gus-asf @janhoy @epugh @sigram