Update bwc version after 2.9 release #1002

junqiu-lei · 2023-07-24T23:10:51Z

Description

Update versions after 2.9 release: change 2.9.0-SNAPSHOT to 2.9.0, add 2.10.0-SNAPSHOT.

Check List

New functionality includes testing.
- All tests pass
New functionality has been documented.
- New functionality has javadoc added
Commits are signed as per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Signed-off-by: Junqiu Lei <junqiu@amazon.com>

vamshin

LGTM! Thanks

navneet1v · 2023-07-25T19:26:10Z

@junqiu-lei not sure if this change fixes the BWC tests, as I can see the tests in the github actions are failing.

junqiu-lei · 2023-07-25T19:36:45Z

@navneet1v The BWC tests error is unrelated to this PR:

> Task :generateTestFixturesEffectiveLombokConfig
/home/runner/work/k-NN/k-NN/src/testFixtures/java/org/opensearch/knn/ODFERestTestCase.java:188: error: cannot find symbol

        XContentType xContentType = XContentType.fromMediaType(response.getEntity().getContentType());
                                                ^
  symbol:   method fromMediaType(String)
  location: class XContentType
> Task :compileTestFixturesJava
/home/runner/work/k-NN/k-NN/src/testFixtures/java/org/opensearch/knn/KNNRestTestCase.java:1277: error: cannot find symbol

        XContentType xContentType = XContentType.fromMediaType(response.getEntity().getContentType());
> Task :compileTestFixturesJava FAILED
                                                ^
  symbol:   method fromMediaType(String)
  location: class XContentType
Note: /home/runner/work/k-NN/k-NN/src/testFixtures/java/org/opensearch/knn/ODFERestTestCase.java uses or overrides a deprecated API.
Note: Recompile with -Xlint:deprecation for details.
Note: /home/runner/work/k-NN/k-NN/src/testFixtures/java/org/opensearch/knn/KNNRestTestCase.java uses unchecked or unsafe operations.
Note: Recompile with -Xlint:unchecked for details.
2 errors

The error is same as the Geospatial plugin one fixed in the PR. I can help to raise a PR later to fix it.

navneet1v · 2023-07-25T22:21:43Z

@navneet1v The BWC tests error is unrelated to this PR:

Block (21 lines)

> Task :generateTestFixturesEffectiveLombokConfig
/home/runner/work/k-NN/k-NN/src/testFixtures/java/org/opensearch/knn/ODFERestTestCase.java:188: error: cannot find symbol

        XContentType xContentType = XContentType.fromMediaType(response.getEntity().getContentType());
                                                ^
  symbol:   method fromMediaType(String)
  location: class XContentType
> Task :compileTestFixturesJava
/home/runner/work/k-NN/k-NN/src/testFixtures/java/org/opensearch/knn/KNNRestTestCase.java:1277: error: cannot find symbol

        XContentType xContentType = XContentType.fromMediaType(response.getEntity().getContentType());
> Task :compileTestFixturesJava FAILED
                                                ^
  symbol:   method fromMediaType(String)
  location: class XContentType
Note: /home/runner/work/k-NN/k-NN/src/testFixtures/java/org/opensearch/knn/ODFERestTestCase.java uses or overrides a deprecated API.
Note: Recompile with -Xlint:deprecation for details.
Note: /home/runner/work/k-NN/k-NN/src/testFixtures/java/org/opensearch/knn/KNNRestTestCase.java uses unchecked or unsafe operations.
Note: Recompile with -Xlint:unchecked for details.
2 errors

The error is same as the Geospatial plugin one fixed in the PR. I can help to raise a PR later to fix it.

can we merge in those changes, as this is not very difficult to know why the tests are not passing.

codecov · 2023-07-26T04:16:12Z

Codecov Report

Merging #1002 (f586df1) into main (5b26be3) will decrease coverage by 0.24%.
The diff coverage is 100.00%.

❗ Current head f586df1 differs from pull request most recent head 01c4e91. Consider uploading reports for the commit 01c4e91 to get more accurate results

@@             Coverage Diff              @@
##               main    #1002      +/-   ##
============================================
- Coverage     85.37%   85.13%   -0.24%     
+ Complexity     1146     1141       -5     
============================================
  Files           154      154              
  Lines          4683     4683              
  Branches        423      423              
============================================
- Hits           3998     3987      -11     
- Misses          495      504       +9     
- Partials        190      192       +2

Files Changed	Coverage Δ
...index/codec/KNN80Codec/KNN80DocValuesConsumer.java	`88.69% <100.00%> (ø)`

... and 2 files with indirect coverage changes

navneet1v · 2023-07-26T07:25:34Z

@junqiu-lei I can still see BWC tests failing. Please check

junqiu-lei · 2023-07-26T17:14:40Z

There is a new error on the BWC CI:

| Output for ./bin/opensearch-plugin:-> Installing file:/home/runner/work/k-NN/k-NN/qa/restart-upgrade/build/private/artifact_tmp/opensearch-knn-2.10.0.zip
> Task :qa:restart-upgrade:testAgainstOldCluster FAILED
| -> Downloading file:/home/runner/work/k-NN/k-NN/qa/restart-upgrade/build/private/artifact_tmp/opensearch-knn-2.10.0.zip
| -> Failed installing file:/home/runner/work/k-NN/k-NN/qa/restart-upgrade/build/private/artifact_tmp/opensearch-knn-2.10.0.zip
| -> Rolling back file:/home/runner/work/k-NN/k-NN/qa/restart-upgrade/build/private/artifact_tmp/opensearch-knn-2.10.0.zip
| -> Rolled back file:/home/runner/work/k-NN/k-NN/qa/restart-upgrade/build/private/artifact_tmp/opensearch-knn-2.10.0.zip
| Exception in thread "main" java.io.FileNotFoundException: /home/runner/work/k-NN/k-NN/qa/restart-upgrade/build/private/artifact_tmp/opensearch-knn-2.10.0.zip (No such file or directory)
| 	at java.base/java.io.FileInputStream.open0(Native Method)
| 	at java.base/java.io.FileInputStream.open(FileInputStream.java:216)
| 	at java.base/java.io.FileInputStream.<init>(FileInputStream.java:157)

naveentatikonda · 2023-07-26T17:21:39Z

There is a new error on the BWC CI:

| Output for ./bin/opensearch-plugin:-> Installing file:/home/runner/work/k-NN/k-NN/qa/restart-upgrade/build/private/artifact_tmp/opensearch-knn-2.10.0.zip
> Task :qa:restart-upgrade:testAgainstOldCluster FAILED
| -> Downloading file:/home/runner/work/k-NN/k-NN/qa/restart-upgrade/build/private/artifact_tmp/opensearch-knn-2.10.0.zip
| -> Failed installing file:/home/runner/work/k-NN/k-NN/qa/restart-upgrade/build/private/artifact_tmp/opensearch-knn-2.10.0.zip
| -> Rolling back file:/home/runner/work/k-NN/k-NN/qa/restart-upgrade/build/private/artifact_tmp/opensearch-knn-2.10.0.zip
| -> Rolled back file:/home/runner/work/k-NN/k-NN/qa/restart-upgrade/build/private/artifact_tmp/opensearch-knn-2.10.0.zip
| Exception in thread "main" java.io.FileNotFoundException: /home/runner/work/k-NN/k-NN/qa/restart-upgrade/build/private/artifact_tmp/opensearch-knn-2.10.0.zip (No such file or directory)
| 	at java.base/java.io.FileInputStream.open0(Native Method)
| 	at java.base/java.io.FileInputStream.open(FileInputStream.java:216)
| 	at java.base/java.io.FileInputStream.<init>(FileInputStream.java:157)

It is failing because k-NN plugin might not be present in the new artifact, 2.10

naveentatikonda · 2023-07-26T17:25:29Z

There is a new error on the BWC CI:

| Output for ./bin/opensearch-plugin:-> Installing file:/home/runner/work/k-NN/k-NN/qa/restart-upgrade/build/private/artifact_tmp/opensearch-knn-2.10.0.zip
> Task :qa:restart-upgrade:testAgainstOldCluster FAILED
| -> Downloading file:/home/runner/work/k-NN/k-NN/qa/restart-upgrade/build/private/artifact_tmp/opensearch-knn-2.10.0.zip
| -> Failed installing file:/home/runner/work/k-NN/k-NN/qa/restart-upgrade/build/private/artifact_tmp/opensearch-knn-2.10.0.zip
| -> Rolling back file:/home/runner/work/k-NN/k-NN/qa/restart-upgrade/build/private/artifact_tmp/opensearch-knn-2.10.0.zip
| -> Rolled back file:/home/runner/work/k-NN/k-NN/qa/restart-upgrade/build/private/artifact_tmp/opensearch-knn-2.10.0.zip
| Exception in thread "main" java.io.FileNotFoundException: /home/runner/work/k-NN/k-NN/qa/restart-upgrade/build/private/artifact_tmp/opensearch-knn-2.10.0.zip (No such file or directory)
| 	at java.base/java.io.FileInputStream.open0(Native Method)
| 	at java.base/java.io.FileInputStream.open(FileInputStream.java:216)
| 	at java.base/java.io.FileInputStream.<init>(FileInputStream.java:157)

@junqiu-lei plugins are not added in the manifest 2.10.0. So, the artifact don't have the plugins and the BWC tests are failing

naveentatikonda · 2023-07-26T17:27:31Z

Please fix the DCO check

junqiu-lei · 2023-07-26T17:37:02Z

Looks like infra team will help to add all components to manifest. cc @prudhvigodithi opensearch-project/opensearch-build@8fb3588

And also we need merge the 2.x PR BWC bump: #979

naveentatikonda · 2023-07-26T17:51:55Z

@junqiu-lei Can you also pls fix the Developer Certificate of Origin Check. I think if we don't fix it now, it will cause the DCO check on future PRs also to fail.

Signed-off-by: Junqiu Lei <junqiu@amazon.com>

junqiu-lei · 2023-07-26T18:00:05Z

Thanks @naveentatikonda, added DCO

junqiu-lei · 2023-07-26T18:07:34Z

The CI failure is expected to fail as k-NN component still not added to manifest 2.10.0.

opensearch-trigger-bot · 2023-07-26T18:09:13Z

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-1002-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 8c79385330d80d225460a713effbaa039aaa886a
# Push it to GitHub
git push --set-upstream origin backport/backport-1002-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-1002-to-2.x.

junqiu-lei · 2023-07-26T18:10:19Z

Will manually raise PR to fix the core refactor to 2.x and then merge #979

Update bwc version after 2.9 release

e5e3066

Signed-off-by: Junqiu Lei <junqiu@amazon.com>

junqiu-lei added Maintenance Add support for new versions of OpenSearch/Dashboards from upstream skip-changelog labels Jul 24, 2023

junqiu-lei requested review from heemin32, navneet1v, VijayanB, vamshin, jmazanec15, naveentatikonda and martin-gaievski as code owners July 24, 2023 23:10

vamshin previously approved these changes Jul 25, 2023

View reviewed changes

junqiu-lei dismissed vamshin’s stale review via 5a49190 July 26, 2023 00:30

junqiu-lei force-pushed the update_bwc_for_2.9 branch from 5a49190 to f586df1 Compare July 26, 2023 03:57

Switch from XContentType to MediaType to fix compilation errors

01c4e91

Signed-off-by: Junqiu Lei <junqiu@amazon.com>

junqiu-lei force-pushed the update_bwc_for_2.9 branch from f586df1 to 01c4e91 Compare July 26, 2023 17:58

naveentatikonda approved these changes Jul 26, 2023

View reviewed changes

heemin32 approved these changes Jul 26, 2023

View reviewed changes

junqiu-lei merged commit 8c79385 into opensearch-project:main Jul 26, 2023
9 of 37 checks passed

junqiu-lei added the backport 2.x label Jul 26, 2023

junqiu-lei mentioned this pull request Jul 26, 2023

[CI failure] k-NN CI failed due to core refactor for MediaTypeParser #1005

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update bwc version after 2.9 release #1002

Update bwc version after 2.9 release #1002

junqiu-lei commented Jul 24, 2023 •

edited

Loading

vamshin left a comment

navneet1v commented Jul 25, 2023

junqiu-lei commented Jul 25, 2023

navneet1v commented Jul 25, 2023

codecov bot commented Jul 26, 2023 •

edited

Loading

navneet1v commented Jul 26, 2023

junqiu-lei commented Jul 26, 2023

naveentatikonda commented Jul 26, 2023

naveentatikonda commented Jul 26, 2023

naveentatikonda commented Jul 26, 2023

junqiu-lei commented Jul 26, 2023

naveentatikonda commented Jul 26, 2023

junqiu-lei commented Jul 26, 2023

junqiu-lei commented Jul 26, 2023 •

edited

Loading

opensearch-trigger-bot bot commented Jul 26, 2023

junqiu-lei commented Jul 26, 2023

Update bwc version after 2.9 release #1002

Update bwc version after 2.9 release #1002

Conversation

junqiu-lei commented Jul 24, 2023 • edited Loading

Description

Check List

vamshin left a comment

Choose a reason for hiding this comment

navneet1v commented Jul 25, 2023

junqiu-lei commented Jul 25, 2023

navneet1v commented Jul 25, 2023

codecov bot commented Jul 26, 2023 • edited Loading

Codecov Report

navneet1v commented Jul 26, 2023

junqiu-lei commented Jul 26, 2023

naveentatikonda commented Jul 26, 2023

naveentatikonda commented Jul 26, 2023

naveentatikonda commented Jul 26, 2023

junqiu-lei commented Jul 26, 2023

naveentatikonda commented Jul 26, 2023

junqiu-lei commented Jul 26, 2023

junqiu-lei commented Jul 26, 2023 • edited Loading

opensearch-trigger-bot bot commented Jul 26, 2023

junqiu-lei commented Jul 26, 2023

junqiu-lei commented Jul 24, 2023 •

edited

Loading

codecov bot commented Jul 26, 2023 •

edited

Loading

junqiu-lei commented Jul 26, 2023 •

edited

Loading