projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
8460: Move loggedDuration from keepstore to sdk pkg as stats.Duration.
[arvados.git]
/
sdk
/
go
/
crunchrunner
/
crunchrunner.go
diff --git
a/sdk/go/crunchrunner/crunchrunner.go
b/sdk/go/crunchrunner/crunchrunner.go
index 8dffd4594f1393e87dae91d1a0ee12c285826a25..5e0e101e7726b25d3791d137a7196d2b219782d6 100644
(file)
--- a/
sdk/go/crunchrunner/crunchrunner.go
+++ b/
sdk/go/crunchrunner/crunchrunner.go
@@
-115,10
+115,12
@@
func setupCommand(cmd *exec.Cmd, taskp TaskDef, outdir string, replacements map[
return "", "", "", err
}
if taskp.KeepTmpOutput {
return "", "", "", err
}
if taskp.KeepTmpOutput {
- // Is there an os.Copy?
- copyFile(v, outdir+"/"+k)
+ err = copyFile(v, outdir+"/"+k)
} else {
} else {
- os.Symlink(v, outdir+"/"+k)
+ err = os.Symlink(v, outdir+"/"+k)
+ }
+ if err != nil {
+ return "", "", "", err
}
}
}
}
}
}
@@
-222,8
+224,8
@@
func getKeepTmp(outdir string) (manifest string, err error) {
return "", err
}
collection := arvados.Collection{}
return "", err
}
collection := arvados.Collection{}
- json.Unmarshal(buf, &collection)
- return collection.ManifestText,
nil
+
err =
json.Unmarshal(buf, &collection)
+ return collection.ManifestText,
err
}
func runner(api IArvadosClient,
}
func runner(api IArvadosClient,
@@
-364,9
+366,9
@@
func runner(api IArvadosClient,
manifest, err = getKeepTmp(outdir)
} else {
manifest, err = WriteTree(kc, outdir)
manifest, err = getKeepTmp(outdir)
} else {
manifest, err = WriteTree(kc, outdir)
- if err != nil {
- return TempFail{err}
- }
+ }
+ if err != nil {
+
return TempFail{err
}
}
// Set status
}
// Set status