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

Jump to bottom

Backport #1122 to 2.x and bump OpenSearch snapshot version to 2.10 #1157

Merged
merged 2 commits into from
Jul 26, 2023
Merged

Backport #1122 to 2.x and bump OpenSearch snapshot version to 2.10 #1157

merged 2 commits into from
Jul 26, 2023

Conversation

MaxKsyunz
Copy link
Contributor

Backported refactor changes only compiled with 2.10 snapshots, so the changes are going in together.

This PR makes #1108 redundant and resolves backporting #1122 to 2.x

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.

@MaxKsyunz MaxKsyunz temporarily deployed to ml-commons-cicd-env July 25, 2023 21:38 — with GitHub Actions Inactive
@MaxKsyunz MaxKsyunz temporarily deployed to ml-commons-cicd-env July 25, 2023 21:38 — with GitHub Actions Inactive
@MaxKsyunz MaxKsyunz temporarily deployed to ml-commons-cicd-env July 25, 2023 21:38 — with GitHub Actions Inactive
@MaxKsyunz MaxKsyunz had a problem deploying to ml-commons-cicd-env July 25, 2023 21:38 — with GitHub Actions Failure
@codecov
Copy link

codecov bot commented Jul 25, 2023 •
edited
Loading

Codecov Report

Merging #1157 (76095ac) into 2.x (5fb3e19) will decrease coverage by 0.06%.
Report is 2 commits behind head on 2.x.
The diff coverage is n/a.

@@             Coverage Diff              @@
##                2.x    #1157      +/-   ##
============================================
- Coverage     78.99%   78.94%   -0.06%     
+ Complexity     2121     2119       -2     
============================================
  Files           167      167              
  Lines          8633     8633              
  Branches        869      869              
============================================
- Hits           6820     6815       -5     
- Misses         1419     1425       +6     
+ Partials        394      393       -1
Flag Coverage Δ
ml-commons 78.94% <ø> (-0.06%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Changed Coverage Δ
...engine/algorithms/remote/AwsConnectorExecutor.java 82.35% <ø> (ø)
.../action/connector/GetConnectorTransportAction.java 76.92% <ø> (ø)
...ction/deploy/TransportDeployModelOnNodeAction.java 16.88% <ø> (ø)
.../opensearch/ml/action/handler/MLSearchHandler.java 87.23% <ø> (ø)
...n/model_group/TransportUpdateModelGroupAction.java 77.69% <ø> (ø)
...h/ml/action/models/DeleteModelTransportAction.java 83.76% <ø> (ø)
...arch/ml/action/models/GetModelTransportAction.java 82.35% <ø> (ø)
...arch/ml/action/profile/MLProfileModelResponse.java 100.00% <ø> (ø)
...search/ml/action/profile/MLProfileNodeRequest.java 100.00% <ø> (ø)
...earch/ml/action/profile/MLProfileNodeResponse.java 89.18% <ø> (ø)
... and 41 more

@MaxKsyunz MaxKsyunz force-pushed the backport/backport-1122-to-2.x branch from 29173f6 to e77d748 Compare July 25, 2023 21:59
@MaxKsyunz MaxKsyunz temporarily deployed to ml-commons-cicd-env July 25, 2023 21:59 — with GitHub Actions Inactive
@MaxKsyunz MaxKsyunz temporarily deployed to ml-commons-cicd-env July 25, 2023 21:59 — with GitHub Actions Inactive
@MaxKsyunz MaxKsyunz temporarily deployed to ml-commons-cicd-env July 25, 2023 21:59 — with GitHub Actions Inactive
@MaxKsyunz MaxKsyunz had a problem deploying to ml-commons-cicd-env July 25, 2023 21:59 — with GitHub Actions Failure
@MaxKsyunz MaxKsyunz temporarily deployed to ml-commons-cicd-env July 25, 2023 22:14 — with GitHub Actions Inactive
@MaxKsyunz MaxKsyunz temporarily deployed to ml-commons-cicd-env July 25, 2023 22:14 — with GitHub Actions Inactive
@MaxKsyunz MaxKsyunz temporarily deployed to ml-commons-cicd-env July 25, 2023 22:14 — with GitHub Actions Inactive
@MaxKsyunz MaxKsyunz temporarily deployed to ml-commons-cicd-env July 25, 2023 22:14 — with GitHub Actions Inactive
@MaxKsyunz MaxKsyunz force-pushed the backport/backport-1122-to-2.x branch from ef8f2f8 to d38d425 Compare July 25, 2023 22:15
@MaxKsyunz MaxKsyunz temporarily deployed to ml-commons-cicd-env July 25, 2023 22:15 — with GitHub Actions Inactive
@MaxKsyunz MaxKsyunz temporarily deployed to ml-commons-cicd-env July 25, 2023 22:15 — with GitHub Actions Inactive
@MaxKsyunz MaxKsyunz temporarily deployed to ml-commons-cicd-env July 25, 2023 22:15 — with GitHub Actions Inactive
@MaxKsyunz MaxKsyunz temporarily deployed to ml-commons-cicd-env July 25, 2023 22:15 — with GitHub Actions Inactive
@MaxKsyunz MaxKsyunz force-pushed the backport/backport-1122-to-2.x branch from d38d425 to e77d748 Compare July 25, 2023 23:18
@MaxKsyunz MaxKsyunz had a problem deploying to ml-commons-cicd-env July 25, 2023 23:24 — with GitHub Actions Failure
@MaxKsyunz MaxKsyunz temporarily deployed to ml-commons-cicd-env July 25, 2023 23:24 — with GitHub Actions Inactive
@MaxKsyunz MaxKsyunz temporarily deployed to ml-commons-cicd-env July 25, 2023 23:24 — with GitHub Actions Inactive
@MaxKsyunz MaxKsyunz temporarily deployed to ml-commons-cicd-env July 25, 2023 23:32 — with GitHub Actions Inactive
@MaxKsyunz MaxKsyunz temporarily deployed to ml-commons-cicd-env July 25, 2023 23:32 — with GitHub Actions Inactive
@MaxKsyunz MaxKsyunz temporarily deployed to ml-commons-cicd-env July 25, 2023 23:32 — with GitHub Actions Inactive
@MaxKsyunz MaxKsyunz temporarily deployed to ml-commons-cicd-env July 25, 2023 23:32 — with GitHub Actions Inactive
@MaxKsyunz MaxKsyunz force-pushed the backport/backport-1122-to-2.x branch from 9431d56 to e77d748 Compare July 25, 2023 23:42
@MaxKsyunz MaxKsyunz temporarily deployed to ml-commons-cicd-env July 25, 2023 23:42 — with GitHub Actions Inactive
@MaxKsyunz MaxKsyunz temporarily deployed to ml-commons-cicd-env July 25, 2023 23:42 — with GitHub Actions Inactive
@MaxKsyunz MaxKsyunz temporarily deployed to ml-commons-cicd-env July 25, 2023 23:42 — with GitHub Actions Inactive
@MaxKsyunz MaxKsyunz temporarily deployed to ml-commons-cicd-env July 25, 2023 23:42 — with GitHub Actions Inactive
@MaxKsyunz MaxKsyunz temporarily deployed to ml-commons-cicd-env July 26, 2023 00:23 — with GitHub Actions Inactive
@MaxKsyunz MaxKsyunz temporarily deployed to ml-commons-cicd-env July 26, 2023 00:23 — with GitHub Actions Inactive
@MaxKsyunz MaxKsyunz had a problem deploying to ml-commons-cicd-env July 26, 2023 00:23 — with GitHub Actions Failure
@MaxKsyunz MaxKsyunz temporarily deployed to ml-commons-cicd-env July 26, 2023 08:49 — with GitHub Actions Inactive
@MaxKsyunz MaxKsyunz temporarily deployed to ml-commons-cicd-env July 26, 2023 08:49 — with GitHub Actions Inactive
@MaxKsyunz MaxKsyunz temporarily deployed to ml-commons-cicd-env July 26, 2023 08:49 — with GitHub Actions Inactive
@MaxKsyunz MaxKsyunz temporarily deployed to ml-commons-cicd-env July 26, 2023 16:48 — with GitHub Actions Inactive
@MaxKsyunz MaxKsyunz temporarily deployed to ml-commons-cicd-env July 26, 2023 16:48 — with GitHub Actions Inactive
@MaxKsyunz MaxKsyunz temporarily deployed to ml-commons-cicd-env July 26, 2023 16:48 — with GitHub Actions Inactive
@MaxKsyunz MaxKsyunz temporarily deployed to ml-commons-cicd-env July 26, 2023 16:48 — with GitHub Actions Inactive
ylwu-amzn
ylwu-amzn approved these changes Jul 26, 2023
View reviewed changes
Copy link
Collaborator

@ylwu-amzn ylwu-amzn left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks for making this change

@ylwu-amzn
Copy link
Collaborator

I think the BWC test failure is caused by OS2.10 not ready. @b4sjoo , can you help take a look.
We can merge this PR first to unblock SQL team. Can fix the BWC failure in a separate PR.

@b4sjoo
Copy link
Collaborator

b4sjoo commented Jul 26, 2023

@ylwu-amzn agree

@ylwu-amzn ylwu-amzn merged commit ce6161b into opensearch-project:2.x Jul 26, 2023
@ylwu-amzn ylwu-amzn mentioned this pull request Jul 29, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@b4sjoo b4sjoo b4sjoo approved these changes

@ylwu-amzn ylwu-amzn ylwu-amzn approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@MaxKsyunz @ylwu-amzn @b4sjoo @martin-gaievski