-
Notifications
You must be signed in to change notification settings - Fork 3.2k
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: Synchronization lock handling in Step/DAG Template level #5081
Merged
Merged
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
62867e4
fix: Synchronization lock handling on Step Template
sarabala1979 9c40b49
added test
sarabala1979 1bd77d2
Merge branch 'master' into wft-stp-sync
sarabala1979 45309e1
Update fields.md
sarabala1979 4f0cea1
Merge branch 'wft-stp-sync' of https://github.com/sarabala1979/argo i…
sarabala1979 5e09f47
addressed comments
sarabala1979 f99486d
codegen
sarabala1979 870a2b4
Merge branch 'master' into wft-stp-sync
sarabala1979 5cb4aaf
Merge branch 'master' into wft-stp-sync
sarabala1979 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -94,11 +94,7 @@ func (woc *wfOperationCtx) executeSteps(ctx context.Context, nodeName string, tm | |
|
||
sgNode := woc.executeStepGroup(ctx, stepGroup.Steps, sgNodeName, &stepsCtx) | ||
|
||
if sgNode.Fulfilled() { | ||
if tmpl.Synchronization != nil { | ||
woc.controller.syncManager.Release(woc.wf, node.ID, tmpl.Synchronization) | ||
} | ||
} else { | ||
if !sgNode.Fulfilled() { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is a bug. Code is releasing parent lock if child completes |
||
woc.log.Infof("Workflow step group node %s not yet completed", sgNode.ID) | ||
return node, nil | ||
} | ||
|
@@ -147,6 +143,7 @@ func (woc *wfOperationCtx) executeSteps(ctx context.Context, nodeName string, tm | |
} | ||
} | ||
} | ||
|
||
woc.updateOutboundNodes(nodeName, tmpl) | ||
// If this template has outputs from any of its steps, copy them to this node here | ||
outputs, err := getTemplateOutputsFromScope(tmpl, stepsCtx.scope) | ||
|
This file contains 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is the right place to check the node status and release the lock.