[ARVADOS] updated: 2.1.0-1698-g8a353bafe

[Git user]

Summary of changes:
 services/keepstore/s3aws_volume.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

       via  8a353bafe477a114c008b64bd25445266d2cf43c (commit)
      from  5ce5bf966dfabbc0beb7330d4c976a23fde3fd83 (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 8a353bafe477a114c008b64bd25445266d2cf43c
Author: Ward Vandewege <ward at curii.com>
Date:   Fri Dec 3 16:29:49 2021 -0500

    17339: fix tests.
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/services/keepstore/s3aws_volume.go b/services/keepstore/s3aws_volume.go
index 4064809d5..a7801ae26 100644
--- a/services/keepstore/s3aws_volume.go
+++ b/services/keepstore/s3aws_volume.go
@@ -119,6 +119,11 @@ func (v *S3AWSVolume) translateError(err error) error {
 		case "NoSuchKey":
 			return os.ErrNotExist
 		}
+	} else {
+		switch err.(type) {
+		case *aws.RequestCanceledError:
+			return context.Canceled
+		}
 	}
 	return err
 }
@@ -582,7 +587,7 @@ func (v *S3AWSVolume) writeObject(ctx context.Context, key string, r io.Reader)
 func (v *S3AWSVolume) Put(ctx context.Context, loc string, block []byte) error {
 	// Do not use putWithPipe here; we want to pass an io.ReadSeeker to the S3
 	// sdk to avoid memory allocation there. See #17339 for more information.
-	return v.WriteBlock(ctx, loc, bytes.NewReader(block))
+	return v.translateError(v.WriteBlock(ctx, loc, bytes.NewReader(block)))
 }
 
 // WriteBlock implements BlockWriter.

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


hooks/post-receive
--