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

[Backport 2.x] [Point in time] Backport point in time changes #4616

Merged
merged 14 commits into from
Oct 6, 2022
Merged

[Backport 2.x] [Point in time] Backport point in time changes #4616

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
d73ba0b
Adding create pit service layer changes
bharath-techie Sep 28, 2022
bf4a458
Adding delete pit service layer changes
bharath-techie Sep 28, 2022
6dd784c
Add service layer changes for list all PITs
bharath-techie Sep 28, 2022
2b2ce71
Add Point In Time Node Stats API ServiceLayer Changes
bharath-techie Sep 28, 2022
06dd6e7
Add changes to Point in time segments API service layer
bharath-techie Sep 28, 2022
667f6a7
Add changes for Create PIT and Delete PIT rest layer and rest high le…
bharath-techie Sep 28, 2022
8ff197f
Added restlayer changes for pit stats
bharath-techie Sep 28, 2022
be7d1e4
2.4 specific fixes
bharath-techie Sep 28, 2022
966cb0b
Modified cat shards test for pit stats
bharath-techie Sep 28, 2022
6a57420
Added rest layer changes for List all PITs and PIT segments
bharath-techie Sep 28, 2022
13aab11
Merge branch '2.x' into pit2.x
bharath-techie Oct 4, 2022
67350ed
Merge branch '2.x' of https://github.com/opensearch-project/OpenSearc…
bharath-techie Oct 4, 2022
a4b1c4e
Merge branch 'pit2.x' of github.com:bharath-techie/OpenSearch into pi…
bharath-techie Oct 4, 2022
1ce4da5
Merge branch '2.x' of https://github.com/opensearch-project/OpenSearc…
bharath-techie Oct 6, 2022
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
8 changes: 4 additions & 4 deletions rest-api-spec/src/main/resources/rest-api-spec/test/pit/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"Create PIT, Search with PIT ID and Delete":
- skip:
version: " - 2.9.99"
reason: "mode to be introduced later than 3.0"
version: " - 2.2.99"
reason: "mode to be introduced later than 2.3"
- do:
indices.create:
index: test_pit
Expand Down Expand Up @@ -90,8 +90,8 @@
---
"Delete all":
- skip:
version: " - 2.9.99"
reason: "mode to be introduced later than 3.0"
version: " - 2.2.99"
reason: "mode to be introduced later than 2.3"
- do:
indices.create:
index: test_pit
Expand Down
4 changes: 2 additions & 2 deletions server/src/main/java/org/opensearch/index/search/stats/SearchStats.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ private Stats(StreamInput in) throws IOException {
suggestTimeInMillis = in.readVLong();
suggestCurrent = in.readVLong();

if (in.getVersion().onOrAfter(Version.V_3_0_0)) {
if (in.getVersion().onOrAfter(Version.V_2_3_0)) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this the only place we are doing serde and relying on versioning?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And in rest high level tests

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/opensearch-project/OpenSearch/pull/4616/files#diff-ea76cbb06bdfab2ac2c0a3f2f044be1c4f01f368d733af690156f18a31ca03b7R3

https://github.com/opensearch-project/OpenSearch/pull/4616/files#diff-ea76cbb06bdfab2ac2c0a3f2f044be1c4f01f368d733af690156f18a31ca03b7R99

These two test files ^

and searchStats file.

pitCount = in.readVLong();
pitTimeInMillis = in.readVLong();
pitCurrent = in.readVLong();
Expand Down Expand Up @@ -292,7 +292,7 @@ public void writeTo(StreamOutput out) throws IOException {
out.writeVLong(suggestTimeInMillis);
out.writeVLong(suggestCurrent);

if (out.getVersion().onOrAfter(Version.V_3_0_0)) {
if (out.getVersion().onOrAfter(Version.V_2_3_0)) {
out.writeVLong(pitCount);
out.writeVLong(pitTimeInMillis);
out.writeVLong(pitCurrent);
Expand Down