-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix flaky test in CardinalityWithRequestBreakerIT
Signed-off-by: Neetika Singhal <neetiks@amazon.com>
- Loading branch information
1 parent
4ad2d4c
commit 956b000
Showing
2 changed files
with
113 additions
and
27 deletions.
There are no files selected for viewing
111 changes: 111 additions & 0 deletions
111
...a/org/opensearch/search/aggregations/ConcurrentSearchCardinalityWithRequestBreakerIT.java
This file contains 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,111 @@ | ||
| /* | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * | ||
| * The OpenSearch Contributors require contributions made to | ||
| * this file be licensed under the Apache-2.0 license or a | ||
| * compatible open source license. | ||
| */ | ||
|
|
||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch 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. | ||
| */ | ||
|
|
||
| /* | ||
| * Modifications Copyright OpenSearch Contributors. See | ||
| * GitHub history for details. | ||
| */ | ||
|
|
||
| package org.opensearch.search.aggregations; | ||
|
|
||
| import org.opensearch.ExceptionsHelper; | ||
| import org.opensearch.OpenSearchException; | ||
| import org.opensearch.action.index.IndexRequestBuilder; | ||
| import org.opensearch.common.settings.Settings; | ||
| import org.opensearch.common.util.FeatureFlags; | ||
| import org.opensearch.core.common.breaker.CircuitBreakingException; | ||
| import org.opensearch.indices.breaker.HierarchyCircuitBreakerService; | ||
| import org.opensearch.test.OpenSearchIntegTestCase; | ||
|
|
||
| import java.util.Map; | ||
| import java.util.stream.IntStream; | ||
|
|
||
| import static org.opensearch.search.aggregations.AggregationBuilders.cardinality; | ||
| import static org.opensearch.search.aggregations.AggregationBuilders.terms; | ||
|
|
||
| /* | ||
| * Creating a separate class for Concurrent Search use-case as parameterization doesn't work with | ||
| * Circuit Breaker causing flaky tests. ref: https://github.com/opensearch-project/OpenSearch/issues/10154 | ||
| * */ | ||
| @OpenSearchIntegTestCase.ClusterScope(scope = OpenSearchIntegTestCase.Scope.TEST) | ||
| public class ConcurrentSearchCardinalityWithRequestBreakerIT extends OpenSearchIntegTestCase { | ||
|
|
||
| @Override | ||
| protected Settings featureFlagSettings() { | ||
| return Settings.builder().put(super.featureFlagSettings()).put(FeatureFlags.CONCURRENT_SEGMENT_SEARCH, "true").build(); | ||
| } | ||
|
|
||
| /** | ||
| * Test that searches using cardinality aggregations returns all request breaker memory. | ||
| */ | ||
| public void testRequestBreaker() throws Exception { | ||
| final String requestBreaker = randomIntBetween(1, 10000) + "kb"; | ||
| logger.info("--> Using request breaker setting: {}", requestBreaker); | ||
|
|
||
| indexRandom( | ||
| true, | ||
| IntStream.range(0, randomIntBetween(10, 1000)) | ||
| .mapToObj( | ||
| i -> client().prepareIndex("test") | ||
| .setId("id_" + i) | ||
| .setSource(Map.of("field0", randomAlphaOfLength(5), "field1", randomAlphaOfLength(5))) | ||
| ) | ||
| .toArray(IndexRequestBuilder[]::new) | ||
| ); | ||
|
|
||
| client().admin() | ||
| .cluster() | ||
| .prepareUpdateSettings() | ||
| .setTransientSettings( | ||
| Settings.builder().put(HierarchyCircuitBreakerService.REQUEST_CIRCUIT_BREAKER_LIMIT_SETTING.getKey(), requestBreaker) | ||
| ) | ||
| .get(); | ||
|
|
||
| try { | ||
| client().prepareSearch("test") | ||
| .addAggregation( | ||
| terms("terms").field("field0.keyword") | ||
| .collectMode(randomFrom(Aggregator.SubAggCollectionMode.values())) | ||
| .order(BucketOrder.aggregation("cardinality", randomBoolean())) | ||
| .subAggregation(cardinality("cardinality").precisionThreshold(randomLongBetween(1, 40000)).field("field1.keyword")) | ||
| ) | ||
| .get(); | ||
| } catch (OpenSearchException e) { | ||
| if (ExceptionsHelper.unwrap(e, CircuitBreakingException.class) == null) { | ||
| throw e; | ||
| } | ||
| } | ||
|
|
||
| client().admin() | ||
| .cluster() | ||
| .prepareUpdateSettings() | ||
| .setTransientSettings(Settings.builder().putNull(HierarchyCircuitBreakerService.REQUEST_CIRCUIT_BREAKER_LIMIT_SETTING.getKey())) | ||
| .get(); | ||
|
|
||
| // validation done by InternalTestCluster.ensureEstimatedStats() | ||
| } | ||
| } |
This file contains 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