Merge pull request #1157 from rudyfly/diskquota

Letty5411 · web-flow · commit a81ff1bb906f · 2018-04-18T20:36:08.000+08:00
bugfix: fix set quota-id without disk-quota
diff --git a/daemon/mgr/container.go b/daemon/mgr/container.go
@@ -1583,6 +1583,9 @@ func (mgr *ContainerManager) parseBinds(ctx context.Context, meta *ContainerMeta
 
 func (mgr *ContainerManager) setMountPointDiskQuota(ctx context.Context, c *ContainerMeta) error {
 	if c.Config.DiskQuota == nil {
+		if c.Config.QuotaID != "" && c.Config.QuotaID != "0" {
+			return fmt.Errorf("invalid argument, set quota-id without disk-quota")
+		}
 		return nil
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1583,6 +1583,9 @@ func (mgr ContainerManager) parseBinds(ctx context.Context, meta ContainerMeta`
`1583`	`1583`
`1584`	`1584`	`func (mgr ContainerManager) setMountPointDiskQuota(ctx context.Context, c ContainerMeta) error {`
`1585`	`1585`	`if c.Config.DiskQuota == nil {`
	`1586`	`+ if c.Config.QuotaID != "" && c.Config.QuotaID != "0" {`
	`1587`	`+ return fmt.Errorf("invalid argument, set quota-id without disk-quota")`
	`1588`	`+ }`
`1586`	`1589`	`return nil`
`1587`	`1590`	`}`
`1588`	`1591`