janhoy commented on code in PR #2059:
URL: https://github.com/apache/solr/pull/2059#discussion_r1381655377
##########
solr/core/src/test/org/apache/solr/util/TestCircuitBreakers.java:
##########
@@ -66,26 +76,39 @@ protected static void indexDocs() {
public void tearDown() throws Exception {
super.tearDown();
dummyMemBreaker.close();
- dummyCBManager.close();
}
@After
public void after() {
removeAllExistingCircuitBreakers();
}
- public void testCBAlwaysTrips() {
+ public void testCBAlwaysTripsWithCorrectCode() {
removeAllExistingCircuitBreakers();
CircuitBreaker circuitBreaker = new MockCircuitBreaker(true);
h.getCore().getCircuitBreakerRegistry().register(circuitBreaker);
- expectThrows(
- SolrException.class,
- () -> {
- h.query(req("name:\"john smith\""));
- });
+ List.of(
+ SolrException.ErrorCode.TOO_MANY_REQUESTS.code,
+ SolrException.ErrorCode.SERVICE_UNAVAILABLE.code,
+ SolrException.ErrorCode.BAD_REQUEST.code)
+ .forEach(
+ code -> {
+ if (code != SolrException.ErrorCode.TOO_MANY_REQUESTS.code) {
+ System.setProperty(
+ CircuitBreaker.SYSPROP_SOLR_CIRCUITBREAKER_ERRORCODE,
String.valueOf(code));
+ }
+ SolrException ex =
+ expectThrows(
+ SolrException.class,
+ () -> {
+ h.query(req("name:\"john smith\""));
+ });
+ assertEquals(code == -1 ? 429 : code, ex.code());
Review Comment:
Sorry, confusion here. I now went back to using -1 as "default", as `null`
is not allowed in the list.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
