[ARVADOS] updated: 1.1.4-148-g10803ca

[Git user]

Summary of changes:
 services/keepstore/s3_volume.go | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

  discards  dd8568e7802f6fb2f82f43b3605c9da3de20ea2e (commit)
       via  10803caaaf1b59caf5e4c49f78eca71685f1c4ae (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (dd8568e7802f6fb2f82f43b3605c9da3de20ea2e)
            \
             N -- N -- N (10803caaaf1b59caf5e4c49f78eca71685f1c4ae)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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 10803caaaf1b59caf5e4c49f78eca71685f1c4ae
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Tue Apr 24 17:03:50 2018 -0400

    13335: Fix warning about expected 404 error.
    
    The expected error (object not found immediately after deleting it)
    was being logged as a warning, and the warning erroneously stated the
    error was from "HEAD recent/X" rather than "HEAD X".
    
    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 532a082..b5a1c97 100644
--- a/services/keepstore/s3_volume.go
+++ b/services/keepstore/s3_volume.go
@@ -835,13 +835,17 @@ func (v *S3Volume) EmptyTrash() {
 		atomic.AddInt64(&blocksDeleted, 1)
 
 		_, err = v.bucket.Head(loc, nil)
-		if os.IsNotExist(err) {
-			err = v.bucket.Del("recent/" + loc)
-			if err != nil {
-				log.Printf("warning: %s: EmptyTrash: deleting %q: %s", v, "recent/"+loc, err)
-			}
-		} else if err != nil {
-			log.Printf("warning: %s: EmptyTrash: HEAD %q: %s", v, "recent/"+loc, err)
+		if err == nil {
+			log.Printf("warning: %s: EmptyTrash: HEAD %q succeeded immediately after deleting %q", v, loc, loc)
+			return
+		}
+		if !os.IsNotExist(v.translateError(err)) {
+			log.Printf("warning: %s: EmptyTrash: HEAD %q: %s", v, loc, err)
+			return
+		}
+		err = v.bucket.Del("recent/" + loc)
+		if err != nil {
+			log.Printf("warning: %s: EmptyTrash: deleting %q: %s", v, "recent/"+loc, err)
 		}
 	}
 

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


hooks/post-receive
--