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 unmappable character for encoding US-ASCII #738

Merged
merged 2 commits into from
Feb 21, 2023

Conversation

ylwu-amzn
Copy link
Collaborator

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.

Signed-off-by: Yaliang Wu <ylwu@amazon.com>
@ylwu-amzn ylwu-amzn requested a review from a team February 21, 2023 18:05
dhrubo-os
dhrubo-os previously approved these changes Feb 21, 2023
@ylwu-amzn
Copy link
Collaborator Author

UT failed https://github.com/opensearch-project/ml-commons/actions/runs/4235564324/jobs/7359342189
@wujunshen , can you help take a look?
BTW, @model-collapse confirmed, we will not release model auto-reload in 2.6, I will rollback the code change in 2.x to make sure the build can pass.

org.opensearch.ml.model.MLModelAutoReloaderITTests > testAutoReloadModelByNodeId_IndexNotFound FAILED
    java.lang.AssertionError: Shard [.plugins-ml-model-reload][0] is still locked after 5 sec waiting

…ode rejoin (opensearch-project#711)"

This reverts commit 7a51dcc.

Signed-off-by: Yaliang Wu <ylwu@amazon.com>
@codecov-commenter
Copy link

codecov-commenter commented Feb 21, 2023

Codecov Report

Merging #738 (7e05b7c) into 2.x (7ae4192) will decrease coverage by 0.23%.
The diff coverage is n/a.

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

@@             Coverage Diff              @@
##                2.x     #738      +/-   ##
============================================
- Coverage     84.55%   84.33%   -0.23%     
+ Complexity     1618     1589      -29     
============================================
  Files           136      135       -1     
  Lines          6068     5935     -133     
  Branches        568      560       -8     
============================================
- Hits           5131     5005     -126     
+ Misses          700      693       -7     
  Partials        237      237              
Flag Coverage Δ
ml-commons 84.33% <ø> (-0.23%) ⬇️

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

Impacted Files Coverage Δ
...gine/algorithms/regression/LogisticRegression.java 80.00% <ø> (ø)
...rg/opensearch/ml/plugin/MachineLearningPlugin.java 98.82% <ø> (-0.03%) ⬇️
.../org/opensearch/ml/settings/MLCommonsSettings.java 100.00% <ø> (ø)
.../cluster/MLCommonsClusterManagerEventListener.java 67.64% <0.00%> (-11.77%) ⬇️
...earch/ml/action/load/TransportLoadModelAction.java 84.07% <0.00%> (-1.77%) ⬇️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@ylwu-amzn
Copy link
Collaborator Author

CVE failure caused by snakeyaml. From the opensearch-project/OpenSearch#5576, the CVE fixed,

I believe all usages of SnakeYaml in OpenSearch are now using SafeConstructor() after #6205, per the recommendation in the CVE.

@Zhangxunmt Zhangxunmt merged commit 407d501 into opensearch-project:2.x Feb 21, 2023
@Yury-Fridlyand Yury-Fridlyand mentioned this pull request Feb 24, 2023
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants