[ARVADOS] updated: 1.2.0-433-g78c18757e

[Git user]

Summary of changes:
 sdk/go/arvados/fs_collection_test.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

       via  78c18757e42c40178d7a9eaf78f7b6d167bee926 (commit)
      from  9b3d58d6fa3d7c300e006af16ce8072bb68eca30 (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 78c18757e42c40178d7a9eaf78f7b6d167bee926
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Wed Nov 28 16:54:27 2018 -0500

    14538: Check write concurrency limit.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/sdk/go/arvados/fs_collection_test.go b/sdk/go/arvados/fs_collection_test.go
index b872cc214..18cf47b1d 100644
--- a/sdk/go/arvados/fs_collection_test.go
+++ b/sdk/go/arvados/fs_collection_test.go
@@ -1046,7 +1046,6 @@ func (s *CollectionFSSuite) TestFlushFullBlocks(c *check.C) {
 		c.Assert(n, check.Equals, len(data))
 		c.Assert(err, check.IsNil)
 	}
-	f.(*filehandle).inode.(*filenode).waitPrune()
 
 	currentMemExtents := func() (memExtents []int) {
 		for idx, e := range f.(*filehandle).inode.(*filenode).segments {
@@ -1057,6 +1056,9 @@ func (s *CollectionFSSuite) TestFlushFullBlocks(c *check.C) {
 		}
 		return
 	}
+
+	c.Check(len(currentMemExtents()) <= concurrentWriters, check.Equals, true)
+	f.(*filehandle).inode.(*filenode).waitPrune()
 	c.Check(currentMemExtents(), check.HasLen, 1)
 
 	m, err := fs.MarshalManifest(".")

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


hooks/post-receive
--