daniel
/
distribution
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #845 from gierschv/add-rados-root-omap 

driver/rados: Create OMAP for root directory
master
Olivier Gambier 2015-08-10 16:20:01 -07:00
parent 143aae8bc5 6c39af6708
commit 1d5b311fc4
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
registry/storage/driver/rados/rados.go
View File

@ -409,7 +409,9 @@ func (d *driver) List(ctx context.Context, dirPath string) ([]string, error) {
keys := make([]string, 0, len(files)) keys := make([]string, 0, len(files))
for k := range files { for k := range files {
keys = append(keys, path.Join(dirPath, k)) if k != dirPath {
keys = append(keys, path.Join(dirPath, k))
}
} }
return keys, nil return keys, nil
@ -528,7 +530,7 @@ func (d *driver) putOid(objectPath string, oid string) error {
} }
// Esure parent virtual directories // Esure parent virtual directories
if createParentReference && directory != "/" { if createParentReference {
return d.putOid(directory, "") return d.putOid(directory, "")
} }
@ -581,7 +583,7 @@ func (d *driver) deleteOid(objectPath string) error {
} }
// Remove reference on parent omaps // Remove reference on parent omaps
if directory != "/" { if directory != "" {
return d.deleteOid(directory) return d.deleteOid(directory)
} }
} }

8
registry/storage/driver/testsuites/testsuites.go
View File

@ -87,6 +87,14 @@ func (suite *DriverSuite) TearDownTest(c *check.C) {
} }
} }
// TestRootExists ensures that all storage drivers have a root path by default.
func (suite *DriverSuite) TestRootExists(c *check.C) {
_, err := suite.StorageDriver.List(suite.ctx, "/")
if err != nil {
c.Fatalf(`the root path "/" should always exist: %v`, err)
}
}
// TestValidPaths checks that various valid file paths are accepted by the // TestValidPaths checks that various valid file paths are accepted by the
// storage driver. // storage driver.
func (suite *DriverSuite) TestValidPaths(c *check.C) { func (suite *DriverSuite) TestValidPaths(c *check.C) {