-
Notifications
You must be signed in to change notification settings - Fork 863
SOLR-18414: Randomize use of QueryLimits in all tests. #4894
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.
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
Open
sigram
wants to merge
9
commits into
apache:main
Choose a base branch
from
sigram:jira/solr-18414-randomize-test-query-limits
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
d51c0bf
SOLR-18414: Randomize use of QueryLimits in all tests.
sigram 35a9b1a
Imports.
sigram 6d27ee2
Oops, nocommit fails the check, make it TODO for now.
sigram 3b902ba
Relax the assertion - racing doesn't have to occur.
sigram 7bc39a0
Move this logic to a TestRule implementation and hook it up to SolrTe…
sigram 01e43f9
Refactor.
sigram 8967e4c
Tidy.
sigram b616e0f
Fix api drift.
sigram 9ab8ad6
small improvements
dsmiley File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
80 changes: 80 additions & 0 deletions
80
solr/test-framework/src/java/org/apache/solr/util/QueryLimitsTestInjectionRule.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.solr.util; | ||
|
|
||
| import java.lang.invoke.MethodHandles; | ||
| import org.apache.solr.search.QueryLimit; | ||
| import org.junit.rules.TestRule; | ||
| import org.junit.runner.Description; | ||
| import org.junit.runners.model.Statement; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| public class QueryLimitsTestInjectionRule implements TestRule { | ||
| private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); | ||
|
|
||
| private static boolean enabled; | ||
|
|
||
| public QueryLimitsTestInjectionRule(boolean enabled) { | ||
| QueryLimitsTestInjectionRule.enabled = enabled; | ||
| } | ||
|
|
||
| @Override | ||
| public Statement apply(final Statement base, final Description description) { | ||
| if (!enabled) { | ||
| return base; | ||
| } | ||
| return new Statement() { | ||
| @Override | ||
| public void evaluate() throws Throwable { | ||
| if (!enabled) { | ||
| base.evaluate(); | ||
| return; | ||
| } | ||
| log.info("###Test is configured to use QueryLimits"); | ||
| try { | ||
| assert TestInjection.queryTimeout == null : "Disabled too late, or was init'ed elsewhere"; | ||
| TestInjection.queryTimeout = | ||
| new QueryLimit() { | ||
| @Override | ||
| public Object currentValue() { | ||
| return "No-Op injected QueryLimit"; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean shouldExit() { | ||
| return false; | ||
| } | ||
| }; | ||
|
|
||
| base.evaluate(); | ||
| } finally { | ||
| // always reset the queryTimeout | ||
| TestInjection.queryTimeout = null; | ||
| } | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| public static void disable() { | ||
| QueryLimitsTestInjectionRule.enabled = false; | ||
| } | ||
|
|
||
| public static boolean isEnabled() { | ||
| return enabled; | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@dsmiley you can't do this, there's no randomized context here yet.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
whoops!