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.

Sign up for GitHub

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 global artifact overwriting in nested workflow #1086

Merged
merged 10 commits into from
Jan 3, 2019
Merged

Fix global artifact overwriting in nested workflow #1086

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
69b5729
Merge pull request #1 from argoproj/master
WeiTang114 Oct 15, 2018
5642307
Support nested steps workflow parallelism
WeiTang114 Oct 16, 2018
4f96f2e
remove debugging logs
WeiTang114 Oct 16, 2018
6259380
countActiveChildren by boundaryID
WeiTang114 Oct 27, 2018
9a18c6a
remove unused code
WeiTang114 Oct 27, 2018
e486893
Add parallelism examples
WeiTang114 Oct 27, 2018
8309a00
Merge branch 'master' of https://github.com/weitang114/argo
WeiTang114 Nov 10, 2018
f80f6f8
Fix global artifact overwriting in nested workflow
WeiTang114 Nov 10, 2018
133d0ba
Logs for investigating global artifact passing
WeiTang114 Nov 10, 2018
05c0fc3
Revert "Logs for investigating global artifact passing"
WeiTang114 Nov 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions workflow/controller/operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1276,7 +1276,7 @@ func (woc *wfOperationCtx) addOutputsToScope(prefix string, outputs *wfv1.Output
if scope != nil {
scope.addArtifactToScope(key, art)
}
woc.addArtifactToGlobalScope(art)
woc.addArtifactToGlobalScope(art, scope)
}
}

Expand Down Expand Up @@ -1383,7 +1383,7 @@ func (woc *wfOperationCtx) addParamToGlobalScope(param wfv1.Parameter) {

// addArtifactToGlobalScope exports any desired node outputs to the global scope
// Optionally adds to a local scope if supplied
func (woc *wfOperationCtx) addArtifactToGlobalScope(art wfv1.Artifact) {
func (woc *wfOperationCtx) addArtifactToGlobalScope(art wfv1.Artifact, scope *wfScope) {
if art.GlobalName == "" {
return
}
Expand All @@ -1397,6 +1397,9 @@ func (woc *wfOperationCtx) addArtifactToGlobalScope(art wfv1.Artifact) {
art.Path = ""
if !reflect.DeepEqual(woc.wf.Status.Outputs.Artifacts[i], art) {
woc.wf.Status.Outputs.Artifacts[i] = art
if scope != nil {
scope.addArtifactToScope(globalArtName, art)
}
woc.log.Infof("overwriting %s: %v", globalArtName, art)
woc.updated = true
}
Expand All @@ -1412,6 +1415,9 @@ func (woc *wfOperationCtx) addArtifactToGlobalScope(art wfv1.Artifact) {
art.Path = ""
woc.log.Infof("setting %s: %v", globalArtName, art)
woc.wf.Status.Outputs.Artifacts = append(woc.wf.Status.Outputs.Artifacts, art)
if scope != nil {
scope.addArtifactToScope(globalArtName, art)
}
woc.updated = true
}

Expand Down