diff --git a/mariner/cleanup.go b/mariner/cleanup.go index b1ec0b0b..4de97a7b 100644 --- a/mariner/cleanup.go +++ b/mariner/cleanup.go @@ -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) @@ -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") @@ -79,7 +84,7 @@ func (engine *K8sEngine) basicCleanup() { } return nil }) - engine.infof("end intermediate file cleanupf") + engine.infof("end intermediate file cleanup") return } diff --git a/mariner/engine.go b/mariner/engine.go index b24ee8bc..ac3434f7 100644 --- a/mariner/engine.go +++ b/mariner/engine.go @@ -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) }