projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '19972-go-client-retry'
[arvados.git]
/
sdk
/
go
/
arvados
/
fs_project.go
diff --git
a/sdk/go/arvados/fs_project.go
b/sdk/go/arvados/fs_project.go
index 88766129ae557962ecb4eb72282ccd2759096e6d..a68e83945e348a0f3e740b7c0a313155917b795a 100644
(file)
--- a/
sdk/go/arvados/fs_project.go
+++ b/
sdk/go/arvados/fs_project.go
@@
-77,7
+77,7
@@
func (fs *customFileSystem) projectsLoadOne(parent inode, uuid, name string) (in
name: coll.Name,
}, nil
} else if strings.Contains(coll.UUID, "-4zz18-") {
name: coll.Name,
}, nil
} else if strings.Contains(coll.UUID, "-4zz18-") {
- return fs.newDeferredCollectionDir(parent, name, coll.UUID, coll.ModifiedAt), nil
+ return fs.newDeferredCollectionDir(parent, name, coll.UUID, coll.ModifiedAt
, coll.Properties
), nil
} else {
log.Printf("group contents: unrecognized UUID in response: %q", coll.UUID)
return nil, ErrInvalidArgument
} else {
log.Printf("group contents: unrecognized UUID in response: %q", coll.UUID)
return nil, ErrInvalidArgument
@@
-147,7
+147,7
@@
func (fs *customFileSystem) projectsLoadAll(parent inode, uuid string) ([]inode,
Properties: i.Properties,
}))
} else if strings.Contains(i.UUID, "-4zz18-") {
Properties: i.Properties,
}))
} else if strings.Contains(i.UUID, "-4zz18-") {
- inodes = append(inodes, fs.newDeferredCollectionDir(parent, i.Name, i.UUID, i.ModifiedAt))
+ inodes = append(inodes, fs.newDeferredCollectionDir(parent, i.Name, i.UUID, i.ModifiedAt
, i.Properties
))
} else {
log.Printf("group contents: unrecognized UUID in response: %q", i.UUID)
return nil, ErrInvalidArgument
} else {
log.Printf("group contents: unrecognized UUID in response: %q", i.UUID)
return nil, ErrInvalidArgument
@@
-163,7
+163,7
@@
func (fs *customFileSystem) newProjectDir(parent inode, name, uuid string, proj
return &hardlink{inode: fs.projectSingleton(uuid, proj), parent: parent, name: name}
}
return &hardlink{inode: fs.projectSingleton(uuid, proj), parent: parent, name: name}
}
-func (fs *customFileSystem) newDeferredCollectionDir(parent inode, name, uuid string, modTime time.Time) inode {
+func (fs *customFileSystem) newDeferredCollectionDir(parent inode, name, uuid string, modTime time.Time
, props map[string]interface{}
) inode {
if modTime.IsZero() {
modTime = time.Now()
}
if modTime.IsZero() {
modTime = time.Now()
}
@@
-175,7
+175,7
@@
func (fs *customFileSystem) newDeferredCollectionDir(parent inode, name, uuid st
name: name,
modTime: modTime,
mode: 0755 | os.ModeDir,
name: name,
modTime: modTime,
mode: 0755 | os.ModeDir,
- sys: func() interface{} { return &Collection{UUID: uuid, Name: name, ModifiedAt: modTime} },
+ sys: func() interface{} { return &Collection{UUID: uuid, Name: name, ModifiedAt: modTime
, Properties: props
} },
},
}
return &deferrednode{wrapped: placeholder, create: func() inode {
},
}
return &deferrednode{wrapped: placeholder, create: func() inode {