kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #35827 from kolyshkin/vfs-quota

Browse source 
Fix VFS vs quota regression
This commit is contained in:
Yong Tang 2017-12-22 12:32:03 -06:00 • committed by GitHub
commit 3e1df952b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
daemon/graphdriver/quota/projectquota.go
View file

@ -350,11 +350,17 @@ func makeBackingFsDev(home string) (string, error) {
backingFsBlockDev := path.Join(home, "backingFsBlockDev") backingFsBlockDev := path.Join(home, "backingFsBlockDev")
// Re-create just in case someone copied the home directory over to a new device // Re-create just in case someone copied the home directory over to a new device
unix.Unlink(backingFsBlockDev) unix.Unlink(backingFsBlockDev)
if err := unix.Mknod(backingFsBlockDev, unix.S_IFBLK|0600, int(stat.Dev)); err != nil { err := unix.Mknod(backingFsBlockDev, unix.S_IFBLK|0600, int(stat.Dev))
switch err {
case nil:
return backingFsBlockDev, nil
case unix.ENOSYS:
return "", ErrQuotaNotSupported
default:
return "", fmt.Errorf("Failed to mknod %s: %v", backingFsBlockDev, err) return "", fmt.Errorf("Failed to mknod %s: %v", backingFsBlockDev, err)
} }
return backingFsBlockDev, nil
} }
func hasQuotaSupport(backingFsBlockDev string) (bool, error) { func hasQuotaSupport(backingFsBlockDev string) (bool, error) {

4
daemon/graphdriver/vfs/driver.go
View file

@ -35,9 +35,7 @@ func Init(home string, options []string, uidMaps, gidMaps []idtools.IDMap) (grap
return nil, err return nil, err
} }
if err := setupDriverQuota(d); err != nil { setupDriverQuota(d)
return nil, err
}
return graphdriver.NewNaiveDiffDriver(d, uidMaps, gidMaps), nil return graphdriver.NewNaiveDiffDriver(d, uidMaps, gidMaps), nil
} }

11
daemon/graphdriver/vfs/quota_linux.go
View file

@ -1,19 +1,20 @@
package vfs package vfs
import "github.com/docker/docker/daemon/graphdriver/quota" import (
"github.com/docker/docker/daemon/graphdriver/quota"
"github.com/sirupsen/logrus"
)
type driverQuota struct { type driverQuota struct {
quotaCtl *quota.Control quotaCtl *quota.Control
} }
func setupDriverQuota(driver *Driver) error { func setupDriverQuota(driver *Driver) {
if quotaCtl, err := quota.NewControl(driver.home); err == nil { if quotaCtl, err := quota.NewControl(driver.home); err == nil {
driver.quotaCtl = quotaCtl driver.quotaCtl = quotaCtl
} else if err != quota.ErrQuotaNotSupported { } else if err != quota.ErrQuotaNotSupported {
return err logrus.Warnf("Unable to setup quota: %v\n", err)
} }
return nil
} }
func (d *Driver) setupQuota(dir string, size uint64) error { func (d *Driver) setupQuota(dir string, size uint64) error {