Re-enabled multi-node integration tests and Fix integration test set up #432

joshpalis · 2024-01-21T02:07:14Z

Description

This PR re-enables multi-node integration tests for JDK 21.0.1 and aims to resolve flaky integration tests.

Issues Resolved

Part of #409

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.

…t create a connector Signed-off-by: Joshua Palis <[email protected]>

Signed-off-by: Joshua Palis <[email protected]>

codecov · 2024-01-21T02:12:06Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (92d9108) 71.88% compared to head (81e94b4) 71.88%.

Additional details and impacted files

@@            Coverage Diff            @@
##               main     #432   +/-   ##
=========================================
  Coverage     71.88%   71.88%           
  Complexity      620      620           
=========================================
  Files            78       78           
  Lines          3126     3126           
  Branches        236      236           
=========================================
  Hits           2247     2247           
  Misses          772      772           
  Partials        107      107

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

Signed-off-by: Joshua Palis <[email protected]>

…ng indices after each test run Signed-off-by: Joshua Palis <[email protected]>

joshpalis · 2024-01-21T03:18:29Z

Security tests are failing due to the misconfiguration of the admin client when attempting to wipe all indices after each test run. The admin client incorrectly does not have the permissions to delete system indices. Will handle after non-security integration / multi-node tests pass consistently

org.opensearch.flowframework.rest.FlowFrameworkSecureRestApiIT > testSearchWorkflowWithReadAccess FAILED
    org.opensearch.client.ResponseException: method [DELETE], host [https://127.0.0.1:34647/], URI [/.plugins-flow-framework-state], status line [HTTP/2.0 403 Forbidden]
    {"error":{"root_cause":[{"type":"security_exception","reason":"no permissions for [] and User [name=admin, backend_roles=[admin], requestedTenant=null]"}],"type":"security_exception","reason":"no permissions for [] and User [name=admin, backend_roles=[admin], requestedTenant=null]"},"status":403}

Signed-off-by: Joshua Palis <[email protected]>

dbwiddis

LGTM!

src/test/java/org/opensearch/flowframework/FlowFrameworkRestTestCase.java

owaiskazi19

LGTM

opensearch-trigger-bot · 2024-01-22T03:05:33Z

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/flow-framework/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/flow-framework/backport-2.x
# Create a new branch
git switch --create backport/backport-432-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 f039d7f802397c02bf3b1314a21a054738096d7a
# Push it to GitHub
git push --set-upstream origin backport/backport-432-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/flow-framework/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-432-to-2.x.

owaiskazi19 · 2024-01-22T03:14:53Z

@joshpalis this PR would need a manual backport.

opensearch-trigger-bot · 2024-01-22T03:15:26Z

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/flow-framework/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/flow-framework/backport-2.x
# Create a new branch
git switch --create backport/backport-432-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 f039d7f802397c02bf3b1314a21a054738096d7a
# Push it to GitHub
git push --set-upstream origin backport/backport-432-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/flow-framework/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-432-to-2.x.

(opensearch-project#432) * Wiping system indices, moving ml config check to individual tests that create a connector Signed-off-by: Joshua Palis <[email protected]> * spotless Signed-off-by: Joshua Palis <[email protected]> * Increasing ML config index timeout for multi-node case Signed-off-by: Joshua Palis <[email protected]> * Including flow framework config in wipeAllODFEIndices method Signed-off-by: Joshua Palis <[email protected]> * exluding model group index from wipe Signed-off-by: Joshua Palis <[email protected]> * testing wipe all indices with client Signed-off-by: Joshua Palis <[email protected]> * Reverting wipe method back to adminClient Signed-off-by: Joshua Palis <[email protected]> * removing deprovision from model tests, not necessary since we're wiping indices after each test run Signed-off-by: Joshua Palis <[email protected]> * Wrapping testFailedUpdateWorkflow provision in ml config check Signed-off-by: Joshua Palis <[email protected]> * Fixing failing security tests Signed-off-by: Joshua Palis <[email protected]> * Testing model redeploy settings Signed-off-by: Joshua Palis <[email protected]> --------- Signed-off-by: Joshua Palis <[email protected]> Co-authored-by: Owais Kazi <[email protected]>

…ation test set up (#434) Re-enabled multi-node integration tests and Fix integration test set up (#432) * Wiping system indices, moving ml config check to individual tests that create a connector * spotless * Increasing ML config index timeout for multi-node case * Including flow framework config in wipeAllODFEIndices method * exluding model group index from wipe * testing wipe all indices with client * Reverting wipe method back to adminClient * removing deprovision from model tests, not necessary since we're wiping indices after each test run * Wrapping testFailedUpdateWorkflow provision in ml config check * Fixing failing security tests * Testing model redeploy settings --------- Signed-off-by: Joshua Palis <[email protected]> Co-authored-by: Joshua Palis <[email protected]> Co-authored-by: Owais Kazi <[email protected]>

Wiping system indices, moving ml config check to individual tests tha…

d09c12c

…t create a connector Signed-off-by: Joshua Palis <[email protected]>

joshpalis requested review from dbwiddis, owaiskazi19, ohltyler, amitgalitz and jackiehanyang as code owners January 21, 2024 02:07

github-actions bot added the backport 2.x backport PRs to 2.x branch label Jan 21, 2024

spotless

9405feb

Signed-off-by: Joshua Palis <[email protected]>

joshpalis added 5 commits January 21, 2024 02:22

Increasing ML config index timeout for multi-node case

cd51dd2

Signed-off-by: Joshua Palis <[email protected]>

Including flow framework config in wipeAllODFEIndices method

7afdee8

Signed-off-by: Joshua Palis <[email protected]>

exluding model group index from wipe

b1a78f6

Signed-off-by: Joshua Palis <[email protected]>

testing wipe all indices with client

ef6f47b

Signed-off-by: Joshua Palis <[email protected]>

Reverting wipe method back to adminClient

814ad8a

Signed-off-by: Joshua Palis <[email protected]>

joshpalis mentioned this pull request Jan 21, 2024

Re-enabling multi-node tests #431

Closed

removing deprovision from model tests, not necessary since we're wipi…

21cb21f

…ng indices after each test run Signed-off-by: Joshua Palis <[email protected]>

joshpalis changed the title ~~Fix integration test set up~~ Re-enabled multi-node integration tests and Fix integration test set up Jan 21, 2024

joshpalis added 3 commits January 21, 2024 03:30

Wrapping testFailedUpdateWorkflow provision in ml config check

0688286

Signed-off-by: Joshua Palis <[email protected]>

Fixing failing security tests

4080129

Signed-off-by: Joshua Palis <[email protected]>

Testing model redeploy settings

fd9c64b

Signed-off-by: Joshua Palis <[email protected]>

dbwiddis approved these changes Jan 21, 2024

View reviewed changes

src/test/java/org/opensearch/flowframework/FlowFrameworkRestTestCase.java Show resolved Hide resolved

joshpalis mentioned this pull request Jan 22, 2024

Replace all CompletableFutures with PlainActionFutures #419

Merged

Merge branch 'main' into fix-integ

81e94b4

owaiskazi19 approved these changes Jan 22, 2024

View reviewed changes

owaiskazi19 merged commit f039d7f into opensearch-project:main Jan 22, 2024
25 checks passed

dbwiddis mentioned this pull request Jan 22, 2024

[Backport 2.x] Re-enabled multi-node integration tests and Fix integration test set up #434

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Re-enabled multi-node integration tests and Fix integration test set up #432

Re-enabled multi-node integration tests and Fix integration test set up #432

joshpalis commented Jan 21, 2024 •

edited

Loading

codecov bot commented Jan 21, 2024 •

edited

Loading

joshpalis commented Jan 21, 2024 •

edited

Loading

dbwiddis left a comment

owaiskazi19 left a comment

opensearch-trigger-bot bot commented Jan 22, 2024

owaiskazi19 commented Jan 22, 2024

opensearch-trigger-bot bot commented Jan 22, 2024

Re-enabled multi-node integration tests and Fix integration test set up #432

Re-enabled multi-node integration tests and Fix integration test set up #432

Conversation

joshpalis commented Jan 21, 2024 • edited Loading

Description

Issues Resolved

codecov bot commented Jan 21, 2024 • edited Loading

Codecov Report

joshpalis commented Jan 21, 2024 • edited Loading

dbwiddis left a comment

Choose a reason for hiding this comment

owaiskazi19 left a comment

Choose a reason for hiding this comment

opensearch-trigger-bot bot commented Jan 22, 2024

owaiskazi19 commented Jan 22, 2024

opensearch-trigger-bot bot commented Jan 22, 2024

joshpalis commented Jan 21, 2024 •

edited

Loading

codecov bot commented Jan 21, 2024 •

edited

Loading

joshpalis commented Jan 21, 2024 •

edited

Loading