Skip to content
This repository has been archived by the owner on Jul 14, 2022. It is now read-only.

Commit

Permalink
Merge pull request #38 from uc-cdis/fix/file-cleanup
Browse files Browse the repository at this point in the history
turn off file cleanup
  • Loading branch information
mattgarvin1 committed Oct 2, 2020
2 parents dc4d5bf + c24fe99 commit fc49633
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
7 changes: 6 additions & 1 deletion mariner/cleanup.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ import (
)

// collect all paths to not delete during basic file cleanup
// # fixme - doesn't collect secondaryFiles, or scatter output (?)
// # something about this is broken and needs to be tested and fixed
func (engine *K8sEngine) collectKeepFiles() {
engine.infof("begin collect paths to keep")
engine.KeepFiles = make(map[string]bool)
Expand Down Expand Up @@ -55,6 +57,9 @@ func (engine *K8sEngine) collectKeepFiles() {
// i.e., delete all paths under the workflow run working dir
// ----- which are not paths associated with a main workflow output param
// called after main workflow finishes running
// # fixme - deletes files that shouldn't be deleted
// # in particular, secondaryFiles and output of scatter tasks
// # something about this function is broken and needs to be tested and fixed
func (engine *K8sEngine) basicCleanup() {
engine.infof("begin intermediate file cleanup")

Expand All @@ -79,7 +84,7 @@ func (engine *K8sEngine) basicCleanup() {
}
return nil
})
engine.infof("end intermediate file cleanupf")
engine.infof("end intermediate file cleanup")
return
}

Expand Down
5 changes: 4 additions & 1 deletion mariner/engine.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,10 @@ func Engine(runID string) (err error) {
if err = engine.runWorkflow(); err != nil {
return engine.errorf("failed to run workflow: %v", err)
}
engine.basicCleanup()

// turning off file cleanup because it's busted and must be fixed
// engine.basicCleanup()

if err = done(runID); err != nil {
return engine.errorf("failed to signal engine completion to sidecar containers: %v", err)
}
Expand Down

0 comments on commit fc49633

Please sign in to comment.