Write backingStoreFsDev file in the store root

* Fix issues with cleanup when XFS driver and quotas are in use [finishes #140762137] Signed-off-by: Tiago Scolari <[email protected]>
cloudfoundry · Mar 1, 2017 · c87252f · c87252f
1 parent fa79e0e
commit c87252f
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 11 deletions.
diff --git a/integration/clean_test.go b/integration/clean_test.go
@@ -76,6 +76,7 @@ var _ = Describe("Clean", func() {
 				_, err := Runner.Create(groot.CreateSpec{
 					ID:        "my-image-2",
 					BaseImage: anotherBaseImagePath,
+					DiskLimit: 10 * 1024 * 1024,
 				})
 				Expect(err).NotTo(HaveOccurred())
 

diff --git a/integration/create_test.go b/integration/create_test.go
@@ -409,6 +409,7 @@ var _ = Describe("Create", func() {
 			_, err := Runner.Create(groot.CreateSpec{
 				ID:        "my-busybox",
 				BaseImage: "docker:///busybox:1.26.2",
+				DiskLimit: 10 * 1024 * 1024,
 			})
 			Expect(err).NotTo(HaveOccurred())
 
@@ -425,11 +426,9 @@ var _ = Describe("Create", func() {
 			Expect(preContents).To(HaveLen(1))
 
 			_, err = Runner.Create(groot.CreateSpec{
-				ID:                          "my-empty",
-				BaseImage:                   "docker:///cfgarden/empty:v0.1.1",
-				CleanOnCreate:               true,
-				CleanOnCreateIgnoreImages:   []string{"docker://my-image"},
-				CleanOnCreateThresholdBytes: int64(250000),
+				ID:            "my-empty",
+				BaseImage:     "docker:///cfgarden/empty:v0.1.1",
+				CleanOnCreate: true,
 			})
 			Expect(err).NotTo(HaveOccurred())
 
@@ -463,11 +462,9 @@ var _ = Describe("Create", func() {
 			Expect(preContents).To(HaveLen(1))
 
 			_, err = Runner.Create(groot.CreateSpec{
-				ID:                          "my-empty",
-				BaseImage:                   "docker:///cfgarden/empty:v0.1.1",
-				CleanOnCreate:               false,
-				CleanOnCreateIgnoreImages:   []string{"docker://my-image"},
-				CleanOnCreateThresholdBytes: int64(250000),
+				ID:            "my-empty",
+				BaseImage:     "docker:///cfgarden/empty:v0.1.1",
+				CleanOnCreate: false,
 			})
 			Expect(err).NotTo(HaveOccurred())
 

diff --git a/store/filesystems/overlayxfs/image_driver_test.go b/store/filesystems/overlayxfs/image_driver_test.go
@@ -204,6 +204,14 @@ var _ = Describe("ImageDriver", func() {
 				spec.DiskLimit = 1024 * 1024 * 10
 			})
 
+			It("creates the backingFsBlockDev device in the `images` parent folder", func() {
+				backingFsBlockDevPath := filepath.Join(StorePath, "backingFsBlockDev")
+
+				Expect(backingFsBlockDevPath).ToNot(BeAnExistingFile())
+				Expect(driver.CreateImage(logger, spec)).To(Succeed())
+				Expect(backingFsBlockDevPath).To(BeAnExistingFile())
+			})
+
 			It("can overwrite files from the lowerdirs", func() {
 				Expect(driver.CreateImage(logger, spec)).To(Succeed())
 				imageRootfsPath := filepath.Join(spec.ImagePath, overlayxfs.RootfsDir)

diff --git a/store/filesystems/overlayxfs/quota/projectquota_cgo.go b/store/filesystems/overlayxfs/quota/projectquota_cgo.go
@@ -325,6 +325,7 @@ func getDirFd(dir *C.DIR) uintptr {
 // and create a block device node under the home directory
 // to be used by quotactl commands
 func makeBackingFsDev(home string) (string, error) {
+	home = path.Dir(home)
 	fileinfo, err := os.Stat(home)
 	if err != nil {
 		return "", err

diff --git a/store/garbage_collector/gc.go b/store/garbage_collector/gc.go
@@ -96,7 +96,7 @@ func (g *GarbageCollector) unusedVolumes(logger lager.Logger, keepImages []strin
 
 	volumes, err := g.volumeDriver.Volumes(logger)
 	if err != nil {
-		return nil, errorspkg.Errorf("failed to retrieve volume list")
+		return nil, errorspkg.Wrap(err, "failed to retrieve volume list")
 	}
 
 	orphanedVolumes := make(map[string]bool)