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

skip running syncup job if no model index #717

Merged
merged 1 commit into from
Jan 31, 2023

Conversation

ylwu-amzn
Copy link
Collaborator

Signed-off-by: Yaliang Wu [email protected]

Description

[Describe what this change achieves]

Issues Resolved

[List any issues this PR will resolve]

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.

@ylwu-amzn ylwu-amzn requested a review from a team January 31, 2023 20:39
@ylwu-amzn ylwu-amzn merged commit 50116bb into opensearch-project:2.x Jan 31, 2023
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.5 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.5 2.5
# Navigate to the new working tree
cd .worktrees/backport-2.5
# Create a new branch
git switch --create backport/backport-717-to-2.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 50116bb84aa8b14fb5948a6e2c2b9f487c573478
# Push it to GitHub
git push --set-upstream origin backport/backport-717-to-2.5
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.5

Then, create a pull request where the base branch is 2.5 and the compare/head branch is backport/backport-717-to-2.5.

@ylwu-amzn ylwu-amzn added the enhancement New feature or request label Jan 31, 2023
Copy link
Collaborator

@Zhangxunmt Zhangxunmt left a comment

Choose a reason for hiding this comment

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

LGTM.

opensearch-trigger-bot bot pushed a commit that referenced this pull request Feb 1, 2023
Signed-off-by: Yaliang Wu <[email protected]>
(cherry picked from commit 50116bb)
ylwu-amzn added a commit that referenced this pull request Feb 1, 2023
Signed-off-by: Yaliang Wu <[email protected]>
(cherry picked from commit 50116bb)

Co-authored-by: Yaliang Wu <[email protected]>
ylwu-amzn added a commit to ylwu-amzn/ml-commons that referenced this pull request Feb 17, 2023
model-collapse pushed a commit that referenced this pull request Feb 20, 2023
…in (#711)

* [wjunshen] #N/A feat: fix after the latest rebase

Signed-off-by: wujunshen <[email protected]>

* [wjunshen] #N/A feat: fix after rebase

Signed-off-by: wujunshen <[email protected]>

* [wjunshen] #N/A feat: fix after rebase

Signed-off-by: wujunshen <[email protected]>

* [wjunshen] #N/A feat: fix after rebase

Signed-off-by: wujunshen <[email protected]>

* [wjunshen] #N/A feat: fix after the latest rebase

Signed-off-by: wujunshen <[email protected]>

* Increment version to 2.6.0-SNAPSHOT (#671)

Signed-off-by: opensearch-ci-bot <[email protected]>

Signed-off-by: opensearch-ci-bot <[email protected]>
Co-authored-by: opensearch-ci-bot <[email protected]>
Signed-off-by: wujunshen <[email protected]>

* fix profile API in example doc (#712)

Signed-off-by: Yaliang Wu <[email protected]>

Signed-off-by: Yaliang Wu <[email protected]>
Signed-off-by: wujunshen <[email protected]>

* change model url to public repo in text embedding model example doc (#713)

Signed-off-by: Yaliang Wu <[email protected]>

Signed-off-by: Yaliang Wu <[email protected]>
Signed-off-by: wujunshen <[email protected]>

* Enhance profile API to add model centric result controlled by view parameter (#714)

* Enhance profile API to add model centric result controled by view paramter

Signed-off-by: Zan Niu <[email protected]>

* Enhance profile API to add model centric result controled by view parameter

Signed-off-by: Zan Niu <[email protected]>

* Enhance profile API to add model centric result controled by view parameter

Signed-off-by: Zan Niu <[email protected]>

---------

Signed-off-by: Zan Niu <[email protected]>
Signed-off-by: wujunshen <[email protected]>

* add planning work nodes to model (#715)

* add planning work nodes to model

Signed-off-by: Yaliang Wu <[email protected]>

* add test

Signed-off-by: Yaliang Wu <[email protected]>

---------

Signed-off-by: Yaliang Wu <[email protected]>
Signed-off-by: wujunshen <[email protected]>

* skip running syncup job if no model index (#717)

Signed-off-by: Yaliang Wu <[email protected]>
Signed-off-by: wujunshen <[email protected]>

* refactor: add DL model class (#722)

* refactor: add DL model class

Signed-off-by: Yaliang Wu <[email protected]>

* fix model url in example doc

Signed-off-by: Yaliang Wu <[email protected]>

* address comments

Signed-off-by: Yaliang Wu <[email protected]>

* fix failed ut

Signed-off-by: Yaliang Wu <[email protected]>

---------

Signed-off-by: Yaliang Wu <[email protected]>
Signed-off-by: wujunshen <[email protected]>

* tune model config: change pooling mode to optional (#724)

Signed-off-by: Yaliang Wu <[email protected]>
Signed-off-by: wujunshen <[email protected]>

* [wjunshen] #N/A feat: make the log readable

Signed-off-by: wujunshen <[email protected]>

* [wjunshen] #N/A feat: add error log

Signed-off-by: wujunshen <[email protected]>

* [wjunshen] #N/A feat: Refer to PR #717,just checking if index exists in cluster metadata

Signed-off-by: wujunshen <[email protected]>

* [wjunshen] #N/A feat: change RunTimeException to MLException

Signed-off-by: wujunshen <[email protected]>

* [wjunshen] #N/A feat: also consider COMPLETED_WITH_ERROR

Signed-off-by: wujunshen <[email protected]>

* [wjunshen] #N/A feat: remove ML_MODEL_RELOAD_MAX_RETRY_TIMES in CommonValue.java

Signed-off-by: wujunshen <[email protected]>

* [wjunshen] #N/A feat: remove Result class

Signed-off-by: wujunshen <[email protected]>

* [wjunshen] #N/A feat: change "reload" and "retry" to a full word

Signed-off-by: wujunshen <[email protected]>

* [wjunshen] #N/A feat: change log info sentence

Signed-off-by: wujunshen <[email protected]>

* [wjunshen] #N/A feat: code format

Signed-off-by: wujunshen <[email protected]>

* [Signed-off-by: wjunshen<[email protected]>] #N/A feat:
1. Let the collection just have all ids of ml node
2. print out full exception stack trace

Signed-off-by: wujunshen <[email protected]>

* [Signed-off-by: wjunshen<[email protected]>] #N/A feat:
use LOAD_THREAD_POOL to replace generic

Signed-off-by: wujunshen <[email protected]>

* [Signed-off-by: wjunshen<[email protected]>] #N/A feat:
print the whole exception stack

Signed-off-by: wujunshen <[email protected]>

* [Signed-off-by: wjunshen<[email protected]>] #N/A feat:
change the IndexNotFoundException to MLException

Signed-off-by: wujunshen <[email protected]>

* [Signed-off-by: wjunshen<[email protected]>] #N/A feat:
add logs when receiving indexRequestBuilder.execute exception

Signed-off-by: wujunshen <[email protected]>

* [Signed-off-by: wjunshen<[email protected]>] #N/A feat:
change the test code after code review

Signed-off-by: wujunshen <[email protected]>

---------

Signed-off-by: wujunshen <[email protected]>
Signed-off-by: opensearch-ci-bot <[email protected]>
Signed-off-by: Yaliang Wu <[email protected]>
Signed-off-by: Zan Niu <[email protected]>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: opensearch-ci-bot <[email protected]>
Co-authored-by: Yaliang Wu <[email protected]>
Co-authored-by: zane-neo <[email protected]>
ylwu-amzn added a commit to ylwu-amzn/ml-commons that referenced this pull request Mar 3, 2023
ylwu-amzn added a commit to ylwu-amzn/ml-commons that referenced this pull request Mar 4, 2023
ylwu-amzn added a commit that referenced this pull request Mar 4, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.5 enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants