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

[Backport 2.x] Manual Back Port of #350 #372

Merged
merged 1 commit into from
Jan 5, 2024

Conversation

joshpalis
Copy link
Member

Description

Manual BP of #350

Issues Resolved

List any issues this PR will resolve, e.g. Closes [...].

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.

…tegration tests (opensearch-project#350)

* Fixing local model integration test

Signed-off-by: Joshua Palis <jpalis@amazon.com>

* Added deploy model flag support for local model registration, added associated integration test

Signed-off-by: Joshua Palis <jpalis@amazon.com>

* Fixing comment

Signed-off-by: Joshua Palis <jpalis@amazon.com>

* Fixing deprovision workflow transport action, removing use of template, ascertaining deprovision sequence from created resources

Signed-off-by: Joshua Palis <jpalis@amazon.com>

* Removing rest status checks for deprovision API tests

Signed-off-by: Joshua Palis <jpalis@amazon.com>

* Increasing wait time for deprovision status

Signed-off-by: Joshua Palis <jpalis@amazon.com>

* Removing sdeprovision status checks for model deployment tests

Signed-off-by: Joshua Palis <jpalis@amazon.com>

* increasing timeout for local model registration test template

Signed-off-by: Joshua Palis <jpalis@amazon.com>

* Reverting timeout increase, setting ML Commons native memory threshold to 100 to avoid opening circuit breaker

Signed-off-by: Joshua Palis <jpalis@amazon.com>

* Passing an action listener to retryableGetMlTask

Signed-off-by: Joshua Palis <jpalis@amazon.com>

* Addressing PR comments, preserving order of resource map

Signed-off-by: Joshua Palis <jpalis@amazon.com>

* Testing if a wait time after deprovisioning will mitigate circuit breaker issues

Signed-off-by: Joshua Palis <jpalis@amazon.com>

* Increasing mlconfig index creation wait time

Signed-off-by: Joshua Palis <jpalis@amazon.com>

* Combining local model registration tests into one

Signed-off-by: Joshua Palis <jpalis@amazon.com>

* removing resource map from deprovision workflow transport action

Signed-off-by: Joshua Palis <jpalis@amazon.com>

* Fixing getResourceFromDeprovisionNOde and tests

Signed-off-by: Joshua Palis <jpalis@amazon.com>

* Separating out local model registration tests, using ml jvm heap memory setting instead of native memory heap setting

Signed-off-by: Joshua Palis <jpalis@amazon.com>

* Testing : removing second local model registration test

Signed-off-by: Joshua Palis <jpalis@amazon.com>

* Reducing model registration tests, testing local model registration with deployed flag, testing remote model registration with deploy step

Signed-off-by: Joshua Palis <jpalis@amazon.com>

* Removing suffix from simulated deploy model step

Signed-off-by: Joshua Palis <jpalis@amazon.com>

---------

Signed-off-by: Joshua Palis <jpalis@amazon.com>
Copy link

codecov bot commented Jan 5, 2024

Codecov Report

Attention: 31 lines in your changes are missing coverage. Please review.

Comparison is base (5e4efcc) 72.55% compared to head (e87cd8b) 72.30%.

Files Patch % Lines
...flowframework/workflow/RegisterLocalModelStep.java 50.00% 17 Missing and 2 partials ⚠️
.../transport/DeprovisionWorkflowTransportAction.java 73.07% 4 Missing and 3 partials ⚠️
...mework/workflow/AbstractRetryableWorkflowStep.java 28.57% 5 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##                2.x     #372      +/-   ##
============================================
- Coverage     72.55%   72.30%   -0.25%     
- Complexity      572      574       +2     
============================================
  Files            72       72              
  Lines          2988     3001      +13     
  Branches        226      230       +4     
============================================
+ Hits           2168     2170       +2     
- Misses          716      727      +11     
  Partials        104      104              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@joshpalis joshpalis merged commit efad064 into opensearch-project:2.x Jan 5, 2024
14 of 15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants