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.

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 - Breaking Change Main OpenSearch project - action move to core #1200

Merged

Conversation

MitchellGale
Copy link
Contributor

Description

Corrects imports for new location with regards to opensearch-project/OpenSearch#9082.

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed 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.

@Yury-Fridlyand
Copy link
Contributor

@b4sjoo, @dhrubo-os, @ylwu-amzn and team: this fix blocks SQL plugin. Please, prioritize reviewing and merging this PR. Thank you!

@MitchellGale MitchellGale force-pushed the dev/fix_breakingCHange_actionMove branch from d939b40 to ff46b90 Compare August 11, 2023 01:28
@codecov
Copy link

codecov bot commented Aug 11, 2023

Codecov Report

Merging #1200 (ff46b90) into main (730f21c) will not change coverage.
The diff coverage is n/a.

@@            Coverage Diff            @@
##               main    #1200   +/-   ##
=========================================
  Coverage     84.12%   84.12%           
  Complexity     1755     1755           
=========================================
  Files           139      139           
  Lines          6716     6716           
  Branches        669      669           
=========================================
  Hits           5650     5650           
  Misses          769      769           
  Partials        297      297           
Flag Coverage Δ
ml-commons 84.12% <ø> (ø)

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

Files Changed Coverage Δ
...rg/opensearch/ml/client/MachineLearningClient.java 100.00% <ø> (ø)
...pensearch/ml/client/MachineLearningNodeClient.java 96.07% <ø> (ø)
...ain/java/org/opensearch/ml/engine/ModelHelper.java 87.61% <ø> (ø)
...thms/anomalylocalization/AnomalyLocalizerImpl.java 97.63% <ø> (ø)
...rithms/metrics_correlation/MetricsCorrelation.java 82.39% <ø> (ø)
...h/ml/action/deploy/TransportDeployModelAction.java 84.55% <ø> (ø)
...ction/deploy/TransportDeployModelOnNodeAction.java 97.40% <ø> (ø)
.../ml/action/execute/TransportExecuteTaskAction.java 100.00% <ø> (ø)
...arch/ml/action/forward/TransportForwardAction.java 95.60% <ø> (ø)
.../opensearch/ml/action/handler/MLSearchHandler.java 86.66% <ø> (ø)
... and 31 more

@b4sjoo b4sjoo merged commit 7467a69 into opensearch-project:main Aug 11, 2023
11 checks passed
@MitchellGale
Copy link
Contributor Author

@ylwu-amzn @b4sjoo @rbhavna can you please add the backport 2.x tag to this PR? If it fails auto-backport I can manually do it.

@opensearch-trigger-bot
Copy link
Contributor

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-1200-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 7467a692e3cf3d7cdf2b5db0b21c11e67fcf5621
# Push it to GitHub
git push --set-upstream origin backport/backport-1200-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-1200-to-2.x.

@saratvemulapalli
Copy link
Member

@MitchellGale added. main and 2.x on ML Commons have diverged a lot. Unfortunately you might have to backport manually.

MitchellGale added a commit to MitchellGale/ml-commons that referenced this pull request Aug 15, 2023
dhrubo-os pushed a commit that referenced this pull request Aug 15, 2023
Signed-off-by: Mitchell Gale <[email protected]>
HenryL27 pushed a commit to HenryL27/ml-commons that referenced this pull request Aug 17, 2023
ylwu-amzn pushed a commit that referenced this pull request Aug 17, 2023
Signed-off-by: Mitchell Gale <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants