[ARVADOS] updated: 1.2.0-40-g6ab0abd1b
Git user
git at public.curoverse.com
Fri Sep 14 11:39:57 EDT 2018
Summary of changes:
services/crunch-run/copier.go | 8 ++++----
services/crunch-run/crunchrun.go | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
via 6ab0abd1ba40262a6bca12dfdd58e3701b274028 (commit)
from b66b029bef5b4b0f54d204318a8928b7a6977219 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 6ab0abd1ba40262a6bca12dfdd58e3701b274028
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date: Fri Sep 14 11:39:26 2018 -0400
14203: Tweak error messages.
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>
diff --git a/services/crunch-run/copier.go b/services/crunch-run/copier.go
index 4a6253c45..3f529f631 100644
--- a/services/crunch-run/copier.go
+++ b/services/crunch-run/copier.go
@@ -70,22 +70,22 @@ type copier struct {
func (cp *copier) Copy() (string, error) {
err := cp.walkMount("", cp.ctrOutputDir, limitFollowSymlinks, true)
if err != nil {
- return "", fmt.Errorf("in walkMount: %v", err)
+ return "", fmt.Errorf("error scanning files to copy to output: %v", err)
}
fs, err := (&arvados.Collection{ManifestText: cp.manifest}).FileSystem(cp.client, cp.keepClient)
if err != nil {
- return "", fmt.Errorf("creating Collection.FileSystem: %v", err)
+ return "", fmt.Errorf("error creating Collection.FileSystem: %v", err)
}
for _, d := range cp.dirs {
err = fs.Mkdir(d, 0777)
if err != nil && err != os.ErrExist {
- return "", fmt.Errorf("Could not Mkdir %v: %v", d, err)
+ return "", fmt.Errorf("error making directory %q in output collection: %v", d, err)
}
}
for _, f := range cp.files {
err = cp.copyFile(fs, f)
if err != nil {
- return "", fmt.Errorf("Could not copyFile %v: %v", f, err)
+ return "", fmt.Errorf("error copying file %q into output collection: %v", f, err)
}
}
return fs.MarshalManifest(".")
diff --git a/services/crunch-run/crunchrun.go b/services/crunch-run/crunchrun.go
index df7b68833..730194b82 100644
--- a/services/crunch-run/crunchrun.go
+++ b/services/crunch-run/crunchrun.go
@@ -1428,11 +1428,11 @@ func (runner *ContainerRunner) Run() (err error) {
// hasn't already been assigned when Run() returns,
// this cleanup func will cause Run() to return the
// first non-nil error that is passed to checkErr().
- checkErr := func(prefix string, e error) {
+ checkErr := func(errorIn string, e error) {
if e == nil {
return
}
- runner.CrunchLog.Printf("%s error: %v", prefix, e)
+ runner.CrunchLog.Printf("error in %s: %v", errorIn, e)
if err == nil {
err = e
}
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list