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] exclude remote models in circuit breaker checks and fix memory CB bugs #2657

Merged
merged 2 commits into from
Jul 23, 2024
Merged

[Backport] exclude remote models in circuit breaker checks and fix memory CB bugs #2657

merged 2 commits into from
Jul 23, 2024

Conversation

Zhangxunmt
Copy link
Collaborator

Description

Manual backport of #2469

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 temporarily deployed to ml-commons-cicd-env July 16, 2024 18:19 — with GitHub Actions Inactive
@ylwu-amzn
Copy link
Collaborator

Make sure CI can pass

@Zhangxunmt Zhangxunmt temporarily deployed to ml-commons-cicd-env July 16, 2024 20:30 — with GitHub Actions Inactive
@ylwu-amzn
Copy link
Collaborator

Make sure CI can pass

/__e/node20/bin/node: /lib64/libm.so.6: version GLIBC_2.27' not found (required by /__e/node20/bin/node) /__e/node20/bin/node: /lib64/libc.so.6: version GLIBC_2.28' not found (required by /__e/node20/bin/node)

It's failing due to the github machine running CI lack glibc dependencies. Verified the CI manually from local machine though.

This PR #2627 is a temp solution to fix the error.
@peterzhuamazon, how about backport that fix to old release branch ? So we can verify the patch with CI.

@Zhangxunmt
Copy link
Collaborator Author

Make sure CI can pass

/__e/node20/bin/node: /lib64/libm.so.6: version GLIBC_2.27' not found (required by /__e/node20/bin/node) /__e/node20/bin/node: /lib64/libc.so.6: version GLIBC_2.28' not found (required by /__e/node20/bin/node)
It's failing due to the github machine running CI lack glibc dependencies. Verified the CI manually from local machine though.

This PR #2627 is a temp solution to fix the error. @peterzhuamazon, how about backport that fix to old release branch ? So we can verify the patch with CI.

I manually added PR 2627 in this commit but still not working for Java in Linux. Can you pls check @peterzhuamazon

@peterzhuamazon
Copy link
Member

Make sure CI can pass

/__e/node20/bin/node: /lib64/libm.so.6: version GLIBC_2.27' not found (required by /__e/node20/bin/node) /__e/node20/bin/node: /lib64/libc.so.6: version GLIBC_2.28' not found (required by /__e/node20/bin/node)
It's failing due to the github machine running CI lack glibc dependencies. Verified the CI manually from local machine though.

This PR #2627 is a temp solution to fix the error. @peterzhuamazon, how about backport that fix to old release branch ? So we can verify the patch with CI.

I manually added PR 2627 in this commit but still not working for Java in Linux. Can you pls check @peterzhuamazon

Like I said in the original PR cherry-pick will not do.
You need to backport that to 2.13, merge it, rebase, then it will take effect on the next.

Thanks.

@peterzhuamazon
Copy link
Member

#2663

@ylwu-amzn
Copy link
Collaborator

#2663

Thanks Peter, @Zhangxunmt , let's merge this PR first, then rebase

@Zhangxunmt Zhangxunmt temporarily deployed to ml-commons-cicd-env July 23, 2024 03:43 — with GitHub Actions Inactive
@Zhangxunmt Zhangxunmt temporarily deployed to ml-commons-cicd-env July 23, 2024 03:43 — with GitHub Actions Inactive
@Zhangxunmt Zhangxunmt temporarily deployed to ml-commons-cicd-env July 23, 2024 03:43 — with GitHub Actions Inactive
@Zhangxunmt Zhangxunmt temporarily deployed to ml-commons-cicd-env July 23, 2024 04:48 — with GitHub Actions Inactive
@Zhangxunmt Zhangxunmt temporarily deployed to ml-commons-cicd-env July 23, 2024 04:48 — with GitHub Actions Inactive
@Zhangxunmt Zhangxunmt temporarily deployed to ml-commons-cicd-env July 23, 2024 04:48 — with GitHub Actions Inactive
@Zhangxunmt Zhangxunmt temporarily deployed to ml-commons-cicd-env July 23, 2024 04:48 — with GitHub Actions Inactive
@Zhangxunmt Zhangxunmt merged commit d21613c into opensearch-project:2.13 Jul 23, 2024
10 of 12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

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

@b4sjoo b4sjoo b4sjoo approved these changes

@dhrubo-os dhrubo-os dhrubo-os left review comments

@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

@ylwu-amzn ylwu-amzn Awaiting requested review from ylwu-amzn ylwu-amzn 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

@samuel-oci samuel-oci Awaiting requested review from samuel-oci samuel-oci is a code owner

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

Successfully merging this pull request may close these issues.
6 participants
@Zhangxunmt @ylwu-amzn @peterzhuamazon @jngz-es @dhrubo-os @b4sjoo