[ARVADOS] created: 1.2.0-350-g7c1f4c3fd

[Git user]

        at  7c1f4c3fd3a6f73dce8643d45ffde28a7eaf66d7 (commit)


commit 7c1f4c3fd3a6f73dce8643d45ffde28a7eaf66d7
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Fri Nov 9 15:02:54 2018 -0500

    14397: Improve error reporting.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/services/keepstore/s3_volume.go b/services/keepstore/s3_volume.go
index f78084dbc..ae1342512 100644
--- a/services/keepstore/s3_volume.go
+++ b/services/keepstore/s3_volume.go
@@ -624,8 +624,10 @@ func (v *S3Volume) safeCopy(dst, src string) error {
 		MetadataDirective: "REPLACE",
 	}, v.bucket.Name+"/"+src)
 	err = v.translateError(err)
-	if err != nil {
+	if os.IsNotExist(err) {
 		return err
+	} else if err != nil {
+		return fmt.Errorf("PutCopy(%q ← %q): %s", dst, v.bucket.Name+"/"+src, err)
 	}
 	if t, err := time.Parse(time.RFC3339Nano, resp.LastModified); err != nil {
 		return fmt.Errorf("PutCopy succeeded but did not return a timestamp: %q: %s", resp.LastModified, err)
diff --git a/services/keepstore/trash_worker.go b/services/keepstore/trash_worker.go
index cbb831ebc..8a9fedfb7 100644
--- a/services/keepstore/trash_worker.go
+++ b/services/keepstore/trash_worker.go
@@ -51,24 +51,24 @@ func TrashItem(trashRequest TrashRequest) {
 	for _, volume := range volumes {
 		mtime, err := volume.Mtime(trashRequest.Locator)
 		if err != nil {
-			log.Printf("%v Delete(%v): %v", volume, trashRequest.Locator, err)
+			log.Printf("%v Trash(%v): %v", volume, trashRequest.Locator, err)
 			continue
 		}
 		if trashRequest.BlockMtime != mtime.UnixNano() {
-			log.Printf("%v Delete(%v): stored mtime %v does not match trash list value %v", volume, trashRequest.Locator, mtime.UnixNano(), trashRequest.BlockMtime)
+			log.Printf("%v Trash(%v): stored mtime %v does not match trash list value %v", volume, trashRequest.Locator, mtime.UnixNano(), trashRequest.BlockMtime)
 			continue
 		}
 
 		if !theConfig.EnableDelete {
-			err = errors.New("did not delete block because EnableDelete is false")
+			err = errors.New("skipping because EnableDelete is false")
 		} else {
 			err = volume.Trash(trashRequest.Locator)
 		}
 
 		if err != nil {
-			log.Printf("%v Delete(%v): %v", volume, trashRequest.Locator, err)
+			log.Printf("%v Trash(%v): %v", volume, trashRequest.Locator, err)
 		} else {
-			log.Printf("%v Delete(%v) OK", volume, trashRequest.Locator)
+			log.Printf("%v Trash(%v) OK", volume, trashRequest.Locator)
 		}
 	}
 }

commit dfe8498ea38d9efc6266122c3166dbec4bb4beb8
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Fri Nov 9 14:53:08 2018 -0500

    14397: Update goamz to fix v4 signature.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/vendor/vendor.json b/vendor/vendor.json
index a6b4c17cf..aac874118 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -6,21 +6,21 @@
 			"checksumSHA1": "jf7K+UTQNIzRdlG5F4zX/8b++/E=",
 			"origin": "github.com/curoverse/goamz/aws",
 			"path": "github.com/AdRoll/goamz/aws",
-			"revision": "21e563311c2dc5ac53464a2c31cb91fb833c6cb9",
+			"revision": "6c300862711dc6972a0686bc2af9ededb1f30836",
 			"revisionTime": "2017-07-27T13:52:37Z"
 		},
 		{
-			"checksumSHA1": "9nUwQXI+pNxZo6bnR7NslpMpfPI=",
+			"checksumSHA1": "+T3Mbw98mQoOgX+z/UpumfTHFlU=",
 			"origin": "github.com/curoverse/goamz/s3",
 			"path": "github.com/AdRoll/goamz/s3",
-			"revision": "21e563311c2dc5ac53464a2c31cb91fb833c6cb9",
+			"revision": "6c300862711dc6972a0686bc2af9ededb1f30836",
 			"revisionTime": "2017-07-27T13:52:37Z"
 		},
 		{
 			"checksumSHA1": "tvxbsTkdjB0C/uxEglqD6JfVnMg=",
 			"origin": "github.com/curoverse/goamz/s3/s3test",
 			"path": "github.com/AdRoll/goamz/s3/s3test",
-			"revision": "21e563311c2dc5ac53464a2c31cb91fb833c6cb9",
+			"revision": "6c300862711dc6972a0686bc2af9ededb1f30836",
 			"revisionTime": "2017-07-27T13:52:37Z"
 		},
 		{

-----------------------------------------------------------------------


hooks/post-receive
--