projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
19192: Add a few bytes to MemorySize to account for data structures.
[arvados.git]
/
sdk
/
go
/
arvados
/
fs_collection_test.go
diff --git
a/sdk/go/arvados/fs_collection_test.go
b/sdk/go/arvados/fs_collection_test.go
index b221aaa083a12fd1f13fd3eaec3d9c0f85ae61b5..c2cac3c6ce2e963b36b7654729e56524ba9bc2db 100644
(file)
--- a/
sdk/go/arvados/fs_collection_test.go
+++ b/
sdk/go/arvados/fs_collection_test.go
@@
-1221,7
+1221,8
@@
func (s *CollectionFSSuite) TestFlushFullBlocksOnly(c *check.C) {
c.Assert(err, check.IsNil)
}
}
c.Assert(err, check.IsNil)
}
}
- c.Check(fs.MemorySize(), check.Equals, int64(nDirs*67<<20))
+ inodebytes := int64((nDirs*(67*2+1) + 1) * 64)
+ c.Check(fs.MemorySize(), check.Equals, int64(nDirs*67<<20)+inodebytes)
c.Check(flushed, check.Equals, int64(0))
waitForFlush := func(expectUnflushed, expectFlushed int64) {
c.Check(flushed, check.Equals, int64(0))
waitForFlush := func(expectUnflushed, expectFlushed int64) {
@@
-1232,27
+1233,27
@@
func (s *CollectionFSSuite) TestFlushFullBlocksOnly(c *check.C) {
}
// Nothing flushed yet
}
// Nothing flushed yet
- waitForFlush((nDirs*67)<<20, 0)
+ waitForFlush((nDirs*67)<<20
+inodebytes
, 0)
// Flushing a non-empty dir "/" is non-recursive and there are
// no top-level files, so this has no effect
fs.Flush("/", false)
// Flushing a non-empty dir "/" is non-recursive and there are
// no top-level files, so this has no effect
fs.Flush("/", false)
- waitForFlush((nDirs*67)<<20, 0)
+ waitForFlush((nDirs*67)<<20
+inodebytes
, 0)
// Flush the full block in dir0
fs.Flush("dir0", false)
// Flush the full block in dir0
fs.Flush("dir0", false)
- waitForFlush((nDirs*67-64)<<20, 64<<20)
+ waitForFlush((nDirs*67-64)<<20
+inodebytes
, 64<<20)
err = fs.Flush("dir-does-not-exist", false)
c.Check(err, check.NotNil)
// Flush full blocks in all dirs
fs.Flush("", false)
err = fs.Flush("dir-does-not-exist", false)
c.Check(err, check.NotNil)
// Flush full blocks in all dirs
fs.Flush("", false)
- waitForFlush(nDirs*3<<20, nDirs*64<<20)
+ waitForFlush(nDirs*3<<20
+inodebytes
, nDirs*64<<20)
// Flush non-full blocks, too
fs.Flush("", true)
// Flush non-full blocks, too
fs.Flush("", true)
- waitForFlush(
0
, nDirs*67<<20)
+ waitForFlush(
inodebytes
, nDirs*67<<20)
}
// Even when writing lots of files/dirs from different goroutines, as
}
// Even when writing lots of files/dirs from different goroutines, as