[ARVADOS] created: 2.1.0-651-g954660e0b

[Git user]

        at  954660e0bae16ea6d50ddc5793fef5e1431cba96 (commit)


commit 954660e0bae16ea6d50ddc5793fef5e1431cba96
Author: Tom Clegg <tom at curii.com>
Date:   Thu Apr 15 09:46:37 2021 -0400

    17346: Don't try to rebalance the zero-length data block.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/sdk/go/arvados/collection.go b/sdk/go/arvados/collection.go
index 030665d77..cec20279d 100644
--- a/sdk/go/arvados/collection.go
+++ b/sdk/go/arvados/collection.go
@@ -53,6 +53,8 @@ func (c Collection) resourceName() string {
 
 // SizedDigests returns the hash+size part of each data block
 // referenced by the collection.
+//
+// Zero-length blocks are not included.
 func (c *Collection) SizedDigests() ([]SizedDigest, error) {
 	manifestText := c.ManifestText
 	if manifestText == "" {
@@ -76,6 +78,10 @@ func (c *Collection) SizedDigests() ([]SizedDigest, error) {
 				// FIXME: ensure it's a file token
 				break
 			}
+			if strings.HasPrefix(token, "d41d8cd98f00b204e9800998ecf8427e+0") {
+				// Exclude "empty block" placeholder
+				continue
+			}
 			// FIXME: shouldn't assume 32 char hash
 			if i := strings.IndexRune(token[33:], '+'); i >= 0 {
 				token = token[:33+i]

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


hooks/post-receive
--