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

fix for updating version numbers for deprecation messages (SyncedFlus… #6936

Merged
merged 1 commit into from
Apr 3, 2023
Merged

fix for updating version numbers for deprecation messages (SyncedFlus… #6936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions ...level/src/test/java/org/opensearch/client/documentation/IndicesClientDocumentationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1033,7 +1033,7 @@ public void testSyncedFlushIndex() throws Exception {

// tag::flush-synced-execute
SyncedFlushResponse flushSyncedResponse = client.indices().flushSynced(request, expectWarnings(
"Synced flush is deprecated and will be removed in 8.0. Use flush at _/flush or /{index}/_flush instead."
"Synced flush is deprecated and will be removed in 3.0. Use flush at _/flush or /{index}/_flush instead."
));
// end::flush-synced-execute

Expand Down Expand Up @@ -1079,7 +1079,7 @@ public void onFailure(Exception e) {

// tag::flush-synced-execute-async
client.indices().flushSyncedAsync(request, expectWarnings(
"Synced flush is deprecated and will be removed in 8.0. Use flush at _/flush or /{index}/_flush instead."
"Synced flush is deprecated and will be removed in 3.0. Use flush at _/flush or /{index}/_flush instead."
), listener); // <1>
// end::flush-synced-execute-async

Expand Down
2 changes: 1 addition & 1 deletion rest-api-spec/src/main/resources/rest-api-spec/test/indices.flush/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
wait_for_status: green
- do:
allowed_warnings:
- Synced flush is deprecated and will be removed in 8.0. Use flush at _/flush or /{index}/_flush instead.
- Synced flush is deprecated and will be removed in 3.0. Use flush at _/flush or /{index}/_flush instead.
indices.flush_synced:
index: testing

Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/org/opensearch/indices/flush/SyncedFlushService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public class SyncedFlushService implements IndexEventListener {
private static final DeprecationLogger DEPRECATION_LOGGER = DeprecationLogger.getLogger(logger.getName());

public static final String SYNCED_FLUSH_DEPRECATION_MESSAGE =
"Synced flush is deprecated and will be removed in 8.0. Use flush at _/flush or /{index}/_flush instead.";
"Synced flush is deprecated and will be removed in 3.0. Use flush at _/flush or /{index}/_flush instead.";

private static final String PRE_SYNCED_FLUSH_ACTION_NAME = "internal:indices/flush/synced/pre";
private static final String SYNCED_FLUSH_ACTION_NAME = "internal:indices/flush/synced/sync";
Expand Down