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

add a flag to distinguish duplicate remote model auto deploy and tran… #2410

Merged
merged 2 commits into from
May 6, 2024
Merged

add a flag to distinguish duplicate remote model auto deploy and tran… #2410

merged 2 commits into from
May 6, 2024

Conversation

Zhangxunmt
Copy link
Collaborator

Description

Adding a flag to avoid race condition of automatic deploying and transport deploying remote models, causing temporary Model deployment state errors. When this flag is true, the transport deploy will continue the deploy and do not throw exceptions.

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.

@Zhangxunmt Zhangxunmt had a problem deploying to ml-commons-cicd-env May 6, 2024 18:05 — with GitHub Actions Error
@Zhangxunmt Zhangxunmt had a problem deploying to ml-commons-cicd-env May 6, 2024 18:05 — with GitHub Actions Failure
@Zhangxunmt Zhangxunmt had a problem deploying to ml-commons-cicd-env May 6, 2024 18:05 — with GitHub Actions Error
@Zhangxunmt Zhangxunmt had a problem deploying to ml-commons-cicd-env May 6, 2024 18:05 — with GitHub Actions Error
@Zhangxunmt Zhangxunmt had a problem deploying to ml-commons-cicd-env May 6, 2024 18:05 — with GitHub Actions Failure
@Zhangxunmt Zhangxunmt had a problem deploying to ml-commons-cicd-env May 6, 2024 18:05 — with GitHub Actions Error
@Zhangxunmt Zhangxunmt had a problem deploying to ml-commons-cicd-env May 6, 2024 18:43 — with GitHub Actions Error
@Zhangxunmt Zhangxunmt had a problem deploying to ml-commons-cicd-env May 6, 2024 18:43 — with GitHub Actions Failure
@Zhangxunmt Zhangxunmt had a problem deploying to ml-commons-cicd-env May 6, 2024 18:43 — with GitHub Actions Error
@Zhangxunmt Zhangxunmt had a problem deploying to ml-commons-cicd-env May 6, 2024 18:43 — with GitHub Actions Error
@Zhangxunmt Zhangxunmt had a problem deploying to ml-commons-cicd-env May 6, 2024 18:43 — with GitHub Actions Failure
@Zhangxunmt Zhangxunmt had a problem deploying to ml-commons-cicd-env May 6, 2024 18:43 — with GitHub Actions Error
@Zhangxunmt Zhangxunmt had a problem deploying to ml-commons-cicd-env May 6, 2024 20:02 — with GitHub Actions Error
@Zhangxunmt Zhangxunmt had a problem deploying to ml-commons-cicd-env May 6, 2024 20:02 — with GitHub Actions Failure
@Zhangxunmt Zhangxunmt had a problem deploying to ml-commons-cicd-env May 6, 2024 20:02 — with GitHub Actions Error
@Zhangxunmt Zhangxunmt had a problem deploying to ml-commons-cicd-env May 6, 2024 20:02 — with GitHub Actions Error
@Zhangxunmt Zhangxunmt had a problem deploying to ml-commons-cicd-env May 6, 2024 20:02 — with GitHub Actions Failure
@Zhangxunmt Zhangxunmt had a problem deploying to ml-commons-cicd-env May 6, 2024 20:49 — with GitHub Actions Error
@Zhangxunmt Zhangxunmt had a problem deploying to ml-commons-cicd-env May 6, 2024 20:49 — with GitHub Actions Error
@Zhangxunmt Zhangxunmt had a problem deploying to ml-commons-cicd-env May 6, 2024 20:49 — with GitHub Actions Failure
@Zhangxunmt Zhangxunmt temporarily deployed to ml-commons-cicd-env May 6, 2024 21:00 — with GitHub Actions Inactive
@Zhangxunmt Zhangxunmt temporarily deployed to ml-commons-cicd-env May 6, 2024 21:00 — with GitHub Actions Inactive
@Zhangxunmt Zhangxunmt temporarily deployed to ml-commons-cicd-env May 6, 2024 21:00 — with GitHub Actions Inactive
@Zhangxunmt Zhangxunmt had a problem deploying to ml-commons-cicd-env May 6, 2024 21:00 — with GitHub Actions Error
@Zhangxunmt Zhangxunmt had a problem deploying to ml-commons-cicd-env May 6, 2024 21:00 — with GitHub Actions Failure
@Zhangxunmt Zhangxunmt had a problem deploying to ml-commons-cicd-env May 6, 2024 21:00 — with GitHub Actions Error
@Zhangxunmt Zhangxunmt merged commit f82e148 into opensearch-project:main May 6, 2024
8 of 11 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request May 6, 2024
@Zhangxunmt @github-actions
add a flag to distinguish duplicate remote model auto deploy and tran… (
2b1c523 
#2410)

* add a flag to distinguish duplicate remote model auto deploy and transport deploy

Signed-off-by: Xun Zhang <[email protected]>

* check for NPE for getIsAutoDeploying

Signed-off-by: Xun Zhang <[email protected]>

---------

Signed-off-by: Xun Zhang <[email protected]>
(cherry picked from commit f82e148)
@opensearch-trigger-bot opensearch-trigger-bot bot mentioned this pull request May 6, 2024
Merged
opensearch-trigger-bot bot pushed a commit that referenced this pull request May 6, 2024
@Zhangxunmt @github-actions
add a flag to distinguish duplicate remote model auto deploy and tran… (
1574266 
#2410)

* add a flag to distinguish duplicate remote model auto deploy and transport deploy

Signed-off-by: Xun Zhang <[email protected]>

* check for NPE for getIsAutoDeploying

Signed-off-by: Xun Zhang <[email protected]>

---------

Signed-off-by: Xun Zhang <[email protected]>
(cherry picked from commit f82e148)
@opensearch-trigger-bot opensearch-trigger-bot bot mentioned this pull request May 6, 2024
Merged
Zhangxunmt added a commit that referenced this pull request May 6, 2024
@opensearch-trigger-bot @Zhangxunmt
add a flag to distinguish duplicate remote model auto deploy and tran… (
618678f 
#2410) (#2411)

* add a flag to distinguish duplicate remote model auto deploy and transport deploy

Signed-off-by: Xun Zhang <[email protected]>

* check for NPE for getIsAutoDeploying

Signed-off-by: Xun Zhang <[email protected]>

---------

Signed-off-by: Xun Zhang <[email protected]>
(cherry picked from commit f82e148)

Co-authored-by: Xun Zhang <[email protected]>
Zhangxunmt added a commit that referenced this pull request May 6, 2024
@opensearch-trigger-bot @Zhangxunmt
add a flag to distinguish duplicate remote model auto deploy and tran… (
fba9606 
#2410) (#2412)

* add a flag to distinguish duplicate remote model auto deploy and transport deploy

Signed-off-by: Xun Zhang <[email protected]>

* check for NPE for getIsAutoDeploying

Signed-off-by: Xun Zhang <[email protected]>

---------

Signed-off-by: Xun Zhang <[email protected]>
(cherry picked from commit f82e148)

Co-authored-by: Xun Zhang <[email protected]>
@Zhangxunmt Zhangxunmt temporarily deployed to ml-commons-cicd-env May 6, 2024 21:56 — with GitHub Actions Inactive
@Zhangxunmt Zhangxunmt temporarily deployed to ml-commons-cicd-env May 6, 2024 21:56 — with GitHub Actions Inactive
@Zhangxunmt Zhangxunmt temporarily deployed to ml-commons-cicd-env May 6, 2024 21:56 — with GitHub Actions Inactive
@Zhangxunmt Zhangxunmt had a problem deploying to ml-commons-cicd-env May 6, 2024 21:56 — with GitHub Actions Error
@Zhangxunmt Zhangxunmt temporarily deployed to ml-commons-cicd-env May 6, 2024 21:56 — with GitHub Actions Inactive
@Zhangxunmt Zhangxunmt had a problem deploying to ml-commons-cicd-env May 6, 2024 21:56 — with GitHub Actions Error
dhrubo-os pushed a commit to dhrubo-os/ml-commons that referenced this pull request May 17, 2024
@opensearch-trigger-bot @Zhangxunmt @dhrubo-os
add a flag to distinguish duplicate remote model auto deploy and tran… (
8a7643a 
opensearch-project#2410) (opensearch-project#2411)

* add a flag to distinguish duplicate remote model auto deploy and transport deploy

Signed-off-by: Xun Zhang <[email protected]>

* check for NPE for getIsAutoDeploying

Signed-off-by: Xun Zhang <[email protected]>

---------

Signed-off-by: Xun Zhang <[email protected]>
(cherry picked from commit f82e148)

Co-authored-by: Xun Zhang <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ylwu-amzn ylwu-amzn ylwu-amzn left review comments

@b4sjoo b4sjoo b4sjoo approved these changes

@jngz-es jngz-es jngz-es approved these changes

@dhrubo-os dhrubo-os Awaiting requested review from dhrubo-os dhrubo-os is a code owner

@model-collapse model-collapse Awaiting requested review from model-collapse model-collapse is a code owner

@rbhavna rbhavna Awaiting requested review from rbhavna rbhavna is a code owner

@zane-neo zane-neo Awaiting requested review from zane-neo zane-neo is a code owner

@austintlee austintlee Awaiting requested review from austintlee austintlee is a code owner

@HenryL27 HenryL27 Awaiting requested review from HenryL27 HenryL27 is a code owner

@sam-herman sam-herman Awaiting requested review from sam-herman

@xinyual xinyual Awaiting requested review from xinyual xinyual is a code owner

Assignees
No one assigned
Labels
backport 2.x backport 2.14
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Zhangxunmt @jngz-es @ylwu-amzn @b4sjoo