Skip to content

Commit eba12fa

Browse files
kkewweikkewwei
authored
Avoid invalid retries on multiple replicas when querying (#17370)
Signed-off-by: kkewwei <kewei.11@bytedance.com> Signed-off-by: kkewwei <kkewwei@163.com>
1 parent 436038d commit eba12fa

File tree

5 files changed

+108
-15
lines changed

5 files changed

+108
-15
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
1212

1313
### Changed
1414
- Change the default max header size from 8KB to 16KB. ([#18024](https://github.com/opensearch-project/OpenSearch/pull/18024))
15+
- Avoid invalid retries in multiple replicas when querying [#17370](https://github.com/opensearch-project/OpenSearch/pull/17370)
1516

1617
### Dependencies
1718
- Bump `com.google.code.gson:gson` from 2.12.1 to 2.13.0 ([#17923](https://github.com/opensearch-project/OpenSearch/pull/17923))
1819
- Bump `com.github.spotbugs:spotbugs-annotations` from 4.9.0 to 4.9.3 ([#17922](https://github.com/opensearch-project/OpenSearch/pull/17922))
1920
- Bump `com.microsoft.azure:msal4j` from 1.18.0 to 1.20.0 ([#17925](https://github.com/opensearch-project/OpenSearch/pull/17925))
2021

21-
### Dependencies
22-
2322
### Deprecated
2423

2524
### Removed

‎libs/core/src/main/java/org/opensearch/OpenSearchException.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,8 +302,12 @@ public Map<String, List<String>> getHeaders() {
302302
* Returns the rest status code associated with this exception.
303303
*/
304304
public RestStatus status() {
305-
Throwable cause = unwrapCause();
306-
if (cause == this) {
305+
return status(this);
306+
}
307+
308+
public static RestStatus status(Throwable t) {
309+
Throwable cause = ExceptionsHelper.unwrapCause(t);
310+
if (cause == t) {
307311
return RestStatus.INTERNAL_SERVER_ERROR;
308312
} else {
309313
return ExceptionsHelper.status(cause);

‎server/src/main/java/org/opensearch/action/search/AbstractSearchAsyncAction.java

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -514,10 +514,19 @@ private void onShardFailure(final int shardIndex, @Nullable SearchShardTarget sh
514514
// we do make sure to clean it on a successful response from a shard
515515
setPhaseResourceUsages();
516516
onShardFailure(shardIndex, shard, e);
517-
SearchShardTarget nextShard = FailAwareWeightedRouting.getInstance()
518-
.findNext(shardIt, clusterState, e, () -> totalOps.incrementAndGet());
519517

520-
final boolean lastShard = nextShard == null;
518+
final SearchShardTarget nextShard;
519+
final boolean lastShard;
520+
final int advanceShardCount;
521+
if (TransportActions.isRetryableSearchException(e)) {
522+
nextShard = FailAwareWeightedRouting.getInstance().findNext(shardIt, clusterState, e, () -> totalOps.incrementAndGet());
523+
lastShard = nextShard == null;
524+
advanceShardCount = 1;
525+
} else {
526+
nextShard = null;
527+
lastShard = true;
528+
advanceShardCount = remainingOpsCount(shardIt);
529+
}
521530
if (logger.isTraceEnabled()) {
522531
logger.trace(
523532
() -> new ParameterizedMessage(
@@ -542,7 +551,7 @@ private void onShardFailure(final int shardIndex, @Nullable SearchShardTarget sh
542551
if (lastShard) {
543552
onShardGroupFailure(shardIndex, shard, e);
544553
}
545-
final int totalOps = this.totalOps.incrementAndGet();
554+
final int totalOps = this.totalOps.addAndGet(advanceShardCount);
546555
if (totalOps == expectedTotalOps) {
547556
try {
548557
onPhaseDone();
@@ -561,6 +570,14 @@ private void onShardFailure(final int shardIndex, @Nullable SearchShardTarget sh
561570
}
562571
}
563572

573+
private int remainingOpsCount(SearchShardIterator shardsIt) {
574+
if (shardsIt.skip()) {
575+
return shardsIt.remaining();
576+
} else {
577+
return shardsIt.remaining() + 1;
578+
}
579+
}
580+
564581
/**
565582
* Executed once for every {@link ShardId} that failed on all available shard routing.
566583
*
@@ -651,12 +668,7 @@ private void onShardResultConsumed(Result result, SearchShardIterator shardIt) {
651668
}
652669

653670
private void successfulShardExecution(SearchShardIterator shardsIt) {
654-
final int remainingOpsOnIterator;
655-
if (shardsIt.skip()) {
656-
remainingOpsOnIterator = shardsIt.remaining();
657-
} else {
658-
remainingOpsOnIterator = shardsIt.remaining() + 1;
659-
}
671+
final int remainingOpsOnIterator = remainingOpsCount(shardsIt);
660672
final int xTotalOps = totalOps.addAndGet(remainingOpsOnIterator);
661673
if (xTotalOps == expectedTotalOps) {
662674
try {

‎server/src/main/java/org/opensearch/action/support/TransportActions.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,11 @@
3434

3535
import org.apache.lucene.store.AlreadyClosedException;
3636
import org.opensearch.ExceptionsHelper;
37+
import org.opensearch.OpenSearchException;
3738
import org.opensearch.action.NoShardAvailableActionException;
3839
import org.opensearch.action.UnavailableShardsException;
40+
import org.opensearch.core.concurrency.OpenSearchRejectedExecutionException;
41+
import org.opensearch.core.tasks.TaskCancelledException;
3942
import org.opensearch.index.IndexNotFoundException;
4043
import org.opensearch.index.shard.IllegalIndexShardStateException;
4144
import org.opensearch.index.shard.ShardNotFoundException;
@@ -64,4 +67,12 @@ public static boolean isReadOverrideException(Exception e) {
6467
return !isShardNotAvailableException(e);
6568
}
6669

70+
public static boolean isRetryableSearchException(final Exception e) {
71+
return (OpenSearchException.status(e).getStatusFamilyCode() != 4) && (e.getCause() instanceof TaskCancelledException == false)
72+
// There exists a scenario where a primary shard (0 replicas) relocates and is in POST_RECOVERY on the
73+
// target node but already deleted on the source node. Search request should still work.
74+
|| (e.getCause() instanceof IndexNotFoundException)
75+
|| (e.getCause() instanceof OpenSearchRejectedExecutionException);
76+
}
77+
6778
}

‎server/src/test/java/org/opensearch/action/search/AbstractSearchAsyncActionTests.java

Lines changed: 68 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
import org.opensearch.core.common.breaker.NoopCircuitBreaker;
5050
import org.opensearch.core.index.Index;
5151
import org.opensearch.core.index.shard.ShardId;
52+
import org.opensearch.core.tasks.TaskCancelledException;
5253
import org.opensearch.core.tasks.resourcetracker.TaskResourceInfo;
5354
import org.opensearch.core.tasks.resourcetracker.TaskResourceUsage;
5455
import org.opensearch.index.query.MatchAllQueryBuilder;
@@ -66,6 +67,7 @@
6667
import org.opensearch.threadpool.TestThreadPool;
6768
import org.opensearch.threadpool.ThreadPool;
6869
import org.opensearch.transport.Transport;
70+
import org.opensearch.transport.TransportException;
6971
import org.junit.After;
7072
import org.junit.Before;
7173

@@ -136,6 +138,7 @@ private AbstractSearchAsyncAction<SearchPhaseResult> createAction(
136138
controlled,
137139
false,
138140
false,
141+
false,
139142
expected,
140143
resourceUsage,
141144
new SearchShardIterator(null, null, Collections.emptyList(), null)
@@ -148,6 +151,7 @@ private AbstractSearchAsyncAction<SearchPhaseResult> createAction(
148151
ActionListener<SearchResponse> listener,
149152
final boolean controlled,
150153
final boolean failExecutePhaseOnShard,
154+
final boolean throw4xxExceptionOnShard,
151155
final boolean catchExceptionWhenExecutePhaseOnShard,
152156
final AtomicLong expected,
153157
final TaskResourceUsage resourceUsage,
@@ -217,7 +221,11 @@ protected void executePhaseOnShard(
217221
final SearchActionListener<SearchPhaseResult> listener
218222
) {
219223
if (failExecutePhaseOnShard) {
220-
listener.onFailure(new ShardNotFoundException(shardIt.shardId()));
224+
if (throw4xxExceptionOnShard) {
225+
listener.onFailure(new TransportException(new TaskCancelledException(shardIt.shardId().toString())));
226+
} else {
227+
listener.onFailure(new ShardNotFoundException(shardIt.shardId()));
228+
}
221229
} else {
222230
if (catchExceptionWhenExecutePhaseOnShard) {
223231
try {
@@ -585,6 +593,7 @@ public void onFailure(Exception e) {
585593
false,
586594
true,
587595
false,
596+
false,
588597
new AtomicLong(),
589598
new TaskResourceUsage(randomLong(), randomLong()),
590599
shards
@@ -601,6 +610,62 @@ public void onFailure(Exception e) {
601610
assertThat(searchResponse.getSuccessfulShards(), equalTo(0));
602611
}
603612

613+
public void testSkipInValidRetryInMultiReplicas() throws InterruptedException {
614+
final Index index = new Index("test", UUID.randomUUID().toString());
615+
final CountDownLatch latch = new CountDownLatch(1);
616+
final AtomicBoolean fail = new AtomicBoolean(true);
617+
618+
List<String> targetNodeIds = List.of("n1", "n2", "n3");
619+
final SearchShardIterator[] shards = IntStream.range(2, 4)
620+
.mapToObj(i -> new SearchShardIterator(null, new ShardId(index, i), targetNodeIds, null, null, null))
621+
.toArray(SearchShardIterator[]::new);
622+
623+
SearchRequest searchRequest = new SearchRequest().allowPartialSearchResults(true);
624+
searchRequest.setMaxConcurrentShardRequests(1);
625+
626+
final ArraySearchPhaseResults<SearchPhaseResult> queryResult = new ArraySearchPhaseResults<>(shards.length);
627+
AbstractSearchAsyncAction<SearchPhaseResult> action = createAction(
628+
searchRequest,
629+
queryResult,
630+
new ActionListener<SearchResponse>() {
631+
@Override
632+
public void onResponse(SearchResponse response) {
633+
634+
}
635+
636+
@Override
637+
public void onFailure(Exception e) {
638+
if (fail.compareAndExchange(true, false)) {
639+
try {
640+
throw new RuntimeException("Simulated exception");
641+
} finally {
642+
executor.submit(() -> latch.countDown());
643+
}
644+
}
645+
}
646+
},
647+
false,
648+
true,
649+
true,
650+
false,
651+
new AtomicLong(),
652+
new TaskResourceUsage(randomLong(), randomLong()),
653+
shards
654+
);
655+
action.run();
656+
assertTrue(latch.await(1, TimeUnit.SECONDS));
657+
InternalSearchResponse internalSearchResponse = InternalSearchResponse.empty();
658+
SearchResponse searchResponse = action.buildSearchResponse(internalSearchResponse, action.buildShardFailures(), null, null);
659+
assertSame(searchResponse.getAggregations(), internalSearchResponse.aggregations());
660+
assertSame(searchResponse.getSuggest(), internalSearchResponse.suggest());
661+
assertSame(searchResponse.getProfileResults(), internalSearchResponse.profile());
662+
assertSame(searchResponse.getHits(), internalSearchResponse.hits());
663+
assertThat(searchResponse.getSuccessfulShards(), equalTo(0));
664+
for (int i = 0; i < shards.length; i++) {
665+
assertEquals(targetNodeIds.size() - 1, shards[i].remaining());
666+
}
667+
}
668+
604669
public void testOnShardSuccessPhaseDoneFailure() throws InterruptedException {
605670
final Index index = new Index("test", UUID.randomUUID().toString());
606671
final CountDownLatch latch = new CountDownLatch(1);
@@ -633,6 +698,7 @@ public void onFailure(Exception e) {
633698
false,
634699
false,
635700
false,
701+
false,
636702
new AtomicLong(),
637703
new TaskResourceUsage(randomLong(), randomLong()),
638704
shards
@@ -685,6 +751,7 @@ public void onFailure(Exception e) {
685751
},
686752
false,
687753
false,
754+
false,
688755
catchExceptionWhenExecutePhaseOnShard,
689756
new AtomicLong(),
690757
new TaskResourceUsage(randomLong(), randomLong()),

0 commit comments

Comments
 (0)