X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/0e2a467a923bd490f3e1dc4d8c00a9e2f29e59d4..7499f61a2912cfdb1a316808fafa6e6ee77ee2e0:/sdk/go/arvados/fs_deferred.go diff --git a/sdk/go/arvados/fs_deferred.go b/sdk/go/arvados/fs_deferred.go index 439eaec7c2..254b90c812 100644 --- a/sdk/go/arvados/fs_deferred.go +++ b/sdk/go/arvados/fs_deferred.go @@ -32,14 +32,14 @@ func deferredCollectionFS(fs FileSystem, parent inode, coll Collection) inode { log.Printf("BUG: unhandled error: %s", err) return placeholder } - cfs, err := coll.FileSystem(fs, fs) + newfs, err := coll.FileSystem(fs, fs) if err != nil { log.Printf("BUG: unhandled error: %s", err) return placeholder } - root := cfs.rootnode() - root.SetParent(parent, coll.Name) - return root + cfs := newfs.(*collectionFileSystem) + cfs.SetParent(parent, coll.Name) + return cfs }} } @@ -87,6 +87,19 @@ func (dn *deferrednode) Child(name string, replace func(inode) (inode, error)) ( return dn.realinode().Child(name, replace) } +// Sync is a no-op if the real inode hasn't even been created yet. +func (dn *deferrednode) Sync() error { + dn.mtx.Lock() + defer dn.mtx.Unlock() + if !dn.created { + return nil + } else if syncer, ok := dn.wrapped.(syncer); ok { + return syncer.Sync() + } else { + return ErrInvalidOperation + } +} + func (dn *deferrednode) Truncate(size int64) error { return dn.realinode().Truncate(size) } func (dn *deferrednode) SetParent(p inode, name string) { dn.realinode().SetParent(p, name) } func (dn *deferrednode) IsDir() bool { return dn.currentinode().IsDir() }