bugfix: can't quota on disk quota

Can't quota on diskquota when mount file system without diskquota. Signed-off-by: Rudy Zhang <rudyflyzhang@gmail.com>
AliyunContainerService · Aug 21, 2018 · 822e154 · 822e154
1 parent 93622fa
commit 822e154
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 6 deletions.
diff --git a/storage/quota/grpquota.go b/storage/quota/grpquota.go
@@ -175,6 +175,11 @@ func (quota *GrpQuotaDriver) CheckMountpoint(devID uint64) (string, bool, string
 		return "", false, ""
 	}
 
+	var (
+		mountPoint string
+		fsType     string
+	)
+
 	// Two formats of group quota.
 	// /dev/sdb1 /home/pouch ext4 rw,relatime,prjquota,data=ordered 0 0
 	// /dev/sda1 /home/pouch ext4 rw,relatime,data=ordered,jqfmt=vfsv0,grpjquota=aquota.group 0 0
@@ -192,12 +197,17 @@ func (quota *GrpQuotaDriver) CheckMountpoint(devID uint64) (string, bool, string
 			continue
 		}
 
+		// get device's mountpoint and fs type.
+		mountPoint = parts[1]
+		fsType = parts[2]
+
+		// check the device turn on the prpquota or not.
 		if strings.Contains(parts[3], "grpquota") || strings.Contains(parts[3], "grpjquota") {
 			return mountPoint, true, fsType
 		}
 	}
 
-	return "", false, ""
+	return mountPoint, false, fsType
 }
 
 // SetDiskQuota is used to set quota for directory.

diff --git a/storage/quota/prjquota.go b/storage/quota/prjquota.go
@@ -185,29 +185,36 @@ func (quota *PrjQuotaDriver) CheckMountpoint(devID uint64) (string, bool, string
 		return "", false, ""
 	}
 
+	var (
+		mountPoint string
+		fsType     string
+	)
+
 	// /dev/sdb1 /home/pouch ext4 rw,relatime,prjquota,data=ordered 0 0
 	for _, line := range strings.Split(string(output), "\n") {
 		parts := strings.Split(line, " ")
 		if len(parts) != 6 {
 			continue
 		}
 
-		mountPoint := parts[1]
-		fsType := parts[2]
-
-		devID2, _ := system.GetDevID(mountPoint)
+		devID2, _ := system.GetDevID(parts[1])
 		if devID != devID2 {
 			continue
 		}
 
+		// get device's mountpoint and fs type.
+		mountPoint = parts[1]
+		fsType = parts[2]
+
+		// check the device turn on the prjquota or not.
 		for _, value := range strings.Split(parts[3], ",") {
 			if value == "prjquota" {
 				return mountPoint, true, fsType
 			}
 		}
 	}
 
-	return "", false, ""
+	return mountPoint, false, fsType
 }
 
 // setQuota uses system tool "setquota" to set project quota for binding of limit and mountpoint and quotaID.