Skip to content
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.

Sign up for GitHub

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

Return 409 Conflict HTTP status instead of 503 on failure to concurre… #8986

Merged
merged 4 commits into from
Aug 14, 2023
Merged

Return 409 Conflict HTTP status instead of 503 on failure to concurre… #8986

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e6451d6
Return 409 Conflict HTTP status instead of 500 on failure to concurre…
baba-devv Jun 25, 2023
06b7e85
Return 409 Conflict HTTP status instead of 500 on failure to concurre…
baba-devv Aug 3, 2023
89ce8f1
Merge branch 'main' into hello1
dblock Aug 10, 2023
7a8057f
Merge branch 'main' into hello1
dblock Aug 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Remote Segment Store Repository setting moved from `index.remote_store.repository` to `index.remote_store.segment.repository` and `cluster.remote_store.repository` to `cluster.remote_store.segment.repository` respectively for Index and Cluster level settings ([#8719](https://github.com/opensearch-project/OpenSearch/pull/8719))
- [Remote Store] Add support to restore only unassigned shards of an index ([#8792](https://github.com/opensearch-project/OpenSearch/pull/8792))
- Replace the deprecated IndexReader APIs with new storedFields() & termVectors() ([#7792](https://github.com/opensearch-project/OpenSearch/pull/7792))
- Return 409 Conflict HTTP status instead of 500 on failure to concurrently execute snapshots ([#5855](https://github.com/opensearch-project/OpenSearch/pull/5855))
dblock marked this conversation as resolved.
Show resolved Hide resolved

### Deprecated

Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/org/opensearch/snapshots/ConcurrentSnapshotExecutionException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,6 @@ public ConcurrentSnapshotExecutionException(StreamInput in) throws IOException {

@Override
public RestStatus status() {
return RestStatus.SERVICE_UNAVAILABLE;
return RestStatus.CONFLICT;
}
}
4 changes: 4 additions & 0 deletions server/src/test/java/org/opensearch/OpenSearchExceptionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@
import org.opensearch.search.SearchParseException;
import org.opensearch.search.SearchShardTarget;
import org.opensearch.search.internal.ShardSearchContextId;
import org.opensearch.snapshots.ConcurrentSnapshotExecutionException;
import org.opensearch.test.OpenSearchTestCase;
import org.opensearch.transport.RemoteTransportException;

Expand Down Expand Up @@ -119,6 +120,9 @@ public void testStatus() {

exception = new RemoteTransportException("test", new IllegalStateException("foobar"));
assertThat(exception.status(), equalTo(RestStatus.INTERNAL_SERVER_ERROR));

exception = new ConcurrentSnapshotExecutionException("testRepo", "testSnap", "test");
assertSame(exception.status(), RestStatus.CONFLICT);
}

public void testGuessRootCause() {
Expand Down