[ARVADOS] updated: 76e2a1fc805e80f6882117848d99782b569b281c

[git at public.curoverse.com]

Summary of changes:
 services/datamanager/collection/collection.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

       via  76e2a1fc805e80f6882117848d99782b569b281c (commit)
      from  719dae9a75af420ebbf0ea8e85db080c1c76455e (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 76e2a1fc805e80f6882117848d99782b569b281c
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Nov 26 14:23:03 2015 -0500

    Warn, but do not error out, if a collection has conflicting block sizes.
    
    If this is treated as a fatal error, any user can stop all garbage
    collection entirely by hand-editing a collection (accidentally or
    maliciously) to include the same block with different size hints.
    
    No issue #

diff --git a/services/datamanager/collection/collection.go b/services/datamanager/collection/collection.go
index df68526..33970d8 100644
--- a/services/datamanager/collection/collection.go
+++ b/services/datamanager/collection/collection.go
@@ -287,13 +287,12 @@ func ProcessCollections(arvLogger *logger.Logger,
 		blockChannel := manifest.BlockIterWithDuplicates()
 		for block := range blockChannel {
 			if storedSize, stored := collection.BlockDigestToSize[block.Digest]; stored && storedSize != block.Size {
-				err = fmt.Errorf(
+				log.Printf(
 					"Collection %s contains multiple sizes (%d and %d) for block %s",
 					collection.UUID,
 					storedSize,
 					block.Size,
 					block.Digest)
-				return
 			}
 			collection.BlockDigestToSize[block.Digest] = block.Size
 		}

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


hooks/post-receive
--