[backport 2.x] Add synchronous execution option to workflow provisioning(#990)#1009
Merged
dbwiddis merged 1 commit intoopensearch-project:2.xfrom Jan 22, 2025
Merged
Conversation
34425a2 to
84ae902
Compare
dbwiddis
previously approved these changes
Jan 17, 2025
Member
|
There's a whole bunch of commits here not part of the backport. :) I like to ignore the instructions on the main pr and do the following:
For now let's try something different.... will wait for integ tests to get fixed and merge the other 2 backports, then toggle the backport label on the main PR and see if it generates properly the next time. |
84ae902 to
ba65765
Compare
…-project#990) * Add synchronous execution option to workflow provisioning Signed-off-by: Junwei Dai <junweid@amazon.com> * code refactor Signed-off-by: Junwei Dai <junweid@amazon.com> * add change log Signed-off-by: Junwei Dai <junweid@amazon.com> * refactor code based on comment Signed-off-by: Junwei Dai <junweid@amazon.com> * fix spotless check Signed-off-by: Junwei Dai <junweid@amazon.com> * Limit workflow timeout to a range of 1 to 300 seconds Signed-off-by: Junwei Dai <junweid@amazon.com> * Limit workflow timeout to a range of 1 to 300 seconds Signed-off-by: Junwei Dai <junweid@amazon.com> * Limit workflow timeout to non-negative Signed-off-by: Junwei Dai <junweid@amazon.com> * Add synchronous execution to reprovision Signed-off-by: Junwei Dai <junweid@amazon.com> * remove unsued common value Signed-off-by: Junwei Dai <junweid@amazon.com> * add reprovision sync execution Signed-off-by: Junwei Dai <junweid@amazon.com> * fix test for WorkflowTimeoutUtilityTests Signed-off-by: Junwei Dai <junweid@amazon.com> * fix test name for WorkflowTimeoutUtilityTests Signed-off-by: Junwei Dai <junweid@amazon.com> * Add comments to explain AtomicBoolean usage in WorkflowTimeoutUtility, update error message Signed-off-by: Junwei Dai <junweid@amazon.com> * fix spotless check Signed-off-by: Junwei Dai <junweid@amazon.com> * addressed some comments Signed-off-by: Junwei Dai <junweid@amazon.com> --------- Signed-off-by: Junwei Dai <junweid@amazon.com> Co-authored-by: Junwei Dai <junweid@amazon.com>
ba65765 to
e362da2
Compare
dbwiddis
approved these changes
Jan 17, 2025
Contributor
|
The backport to 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-1009-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 8d4550dbd233f1f1d0ddd07c864a3127f2575fad
# Push it to GitHub
git push --set-upstream origin backport/backport-1009-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/flow-framework/backport-2.xThen, create a pull request where the |
1 task
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Manually backport #990 to 2.x
Related Issues
Resolves #[Issue number to be closed when this PR is merged]
Check List
--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.