Skip to content

fix bug handleReprovision missing wait_for_completion_timeout response#1107

Merged
dbwiddis merged 6 commits into
opensearch-project:mainfrom
junweid62:bug-fix-reprovision
Apr 18, 2025
Merged

fix bug handleReprovision missing wait_for_completion_timeout response#1107
dbwiddis merged 6 commits into
opensearch-project:mainfrom
junweid62:bug-fix-reprovision

Conversation

@junweid62
Copy link
Copy Markdown
Collaborator

Description

bug fix

Related Issues

Resolves #1106

Check List

  • New functionality includes testing.
  • New functionality has been documented.
  • API changes companion pull request created.
  • Commits are signed per the DCO using --signoff.
  • Public documentation issue/PR created.

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.

…e logic

Signed-off-by: Junwei Dai <junweid@amazon.com>
Signed-off-by: Junwei Dai <junweid@amazon.com>
Signed-off-by: Junwei Dai <junweid@amazon.com>
@dbwiddis
Copy link
Copy Markdown
Member

Should this have been caught in an integ test?

@codecov
Copy link
Copy Markdown

codecov Bot commented Apr 11, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 77.33%. Comparing base (f8923ab) to head (e23003a).
Report is 4 commits behind head on main.

Additional details and impacted files
@@             Coverage Diff              @@
##               main    #1107      +/-   ##
============================================
+ Coverage     77.30%   77.33%   +0.03%     
- Complexity     1094     1096       +2     
============================================
  Files           101      101              
  Lines          5305     5308       +3     
  Branches        510      511       +1     
============================================
+ Hits           4101     4105       +4     
  Misses          954      954              
+ Partials        250      249       -1     

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

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@junweid62 junweid62 closed this Apr 11, 2025
@junweid62 junweid62 reopened this Apr 11, 2025
Junwei Dai added 2 commits April 11, 2025 10:14
Signed-off-by: Junwei Dai <junweid@amazon.com>
Signed-off-by: Junwei Dai <junweid@amazon.com>
@junweid62
Copy link
Copy Markdown
Collaborator Author

Should this have been caught in an integ test?

I’ve already added a unit test for this case, but it looks like we don’t currently have an integration test that would have caught it. Might be worth considering adding one.

@dbwiddis
Copy link
Copy Markdown
Member

Unit test is probably enough here.

Signed-off-by: Daniel Widdis <widdis@gmail.com>
@dbwiddis dbwiddis merged commit 3f7d550 into opensearch-project:main Apr 18, 2025
23 checks passed
@opensearch-trigger-bot
Copy link
Copy Markdown
Contributor

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-1107-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 3f7d5501495d1852e32b0b25356229ab0d135713
# Push it to GitHub
git push --set-upstream origin backport/backport-1107-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-1107-to-2.x.

@opensearch-trigger-bot opensearch-trigger-bot Bot added the backport-failed Applied to PRs when the automatic backport fails label Apr 18, 2025
@opensearch-trigger-bot
Copy link
Copy Markdown
Contributor

The backport to 2.19 failed:

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

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.19 2.19
# Navigate to the new working tree
pushd ../.worktrees/flow-framework/backport-2.19
# Create a new branch
git switch --create backport/backport-1107-to-2.19
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 3f7d5501495d1852e32b0b25356229ab0d135713
# Push it to GitHub
git push --set-upstream origin backport/backport-1107-to-2.19
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/flow-framework/backport-2.19

Then, create a pull request where the base branch is 2.19 and the compare/head branch is backport/backport-1107-to-2.19.

opensearch-trigger-bot Bot pushed a commit that referenced this pull request Apr 29, 2025
#1107)

* fix bug handleReprovision missing wait_for_completion_timeout response logic

Signed-off-by: Junwei Dai <junweid@amazon.com>

* add change log

Signed-off-by: Junwei Dai <junweid@amazon.com>

* change log in 3.x

Signed-off-by: Junwei Dai <junweid@amazon.com>

* Add unit test for reprovision

Signed-off-by: Junwei Dai <junweid@amazon.com>

* spotless

Signed-off-by: Junwei Dai <junweid@amazon.com>

---------

Signed-off-by: Junwei Dai <junweid@amazon.com>
(cherry picked from commit 3f7d550)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
saimedhi pushed a commit to saimedhi/flow-framework that referenced this pull request Apr 29, 2025
…eout response (opensearch-project#1107)

Signed-off-by: Sai Medhini Reddy Maryada <saimedhi@amazon.com>
peterzhuamazon pushed a commit that referenced this pull request Apr 29, 2025
…_tieeout response (#1130)

backporting fix bug handleReprovision missing wait_for_completion_timeout response (#1107)

Signed-off-by: Sai Medhini Reddy Maryada <saimedhi@amazon.com>
Co-authored-by: Junwei Dai <59641585+junweid62@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport 2.x backport PRs to 2.x branch backport 2.19 backport 3.0 backport-failed Applied to PRs when the automatic backport fails

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[BUG]handleReprovision missing wait_for_completion_timeout response logic

4 participants