XFS quota fixes

  1. make set_xfs_quota idempotent
  2. restrict xfs managed tree recursion to 0
  	   -  This can be done because when we provision new volumes,
	      we always start with a empty directory (i.e. there are no files to traverse through)
	   -  When reusing old volumes, we do not call xfs_set_quota

Signed-off-by: wlan0 <sidharthamn@gmail.com>

Author: wlan0

go.mod

@@ -12,6 +12,7 @@ require (
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
 	github.com/golang/protobuf v1.4.3 // indirect
 	github.com/gopherjs/gopherjs v0.0.0-20190328170749-bb2674552d8f // indirect
+	github.com/hashicorp/errwrap v1.1.0
 	github.com/imdario/mergo v0.3.7 // indirect
 	github.com/jedib0t/go-pretty v4.3.0+incompatible
 	github.com/jedib0t/go-pretty/v6 v6.0.5

go.sum

@@ -327,6 +327,8 @@ github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoP
 github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
 github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
+github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
+github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod h1:9bjs9uLqI8l75knNv3lV1kA55veR+WUPSiKIWcQHudI=

pkg/sys/xfs/xfs_quota.go

@@ -19,12 +19,19 @@ package xfs
 import (
 	"context"
 	"encoding/binary"
+	"errors"
 	"fmt"
-	simd "github.com/minio/sha256-simd"
 	"math"
 	"os/exec"
 	"strconv"
 	"strings"
+
+	"github.com/golang/glog"
+	simd "github.com/minio/sha256-simd"
+)
+
+var (
+	ErrProjNotFound = errors.New("xfs project not found")
 )
 
 type XFSQuota struct {
@@ -47,20 +54,35 @@ func getProjectIDHash(id string) string {
 // SetQuota creates a projectID and sets the hardlimit for the path
 func (xfsq *XFSQuota) SetQuota(ctx context.Context, limit int64) error {
 
+	_, err := xfsq.GetVolumeStats(ctx)
+	// error getting quota value
+	if err != nil && err != ErrProjNotFound {
+		return err
+	}
+	// this means quota has already been set
+	if err == nil {
+		return nil
+	}
+
 	limitInStr := strconv.FormatInt(limit, 10)
 	pid := getProjectIDHash(xfsq.ProjectID)
 
-	cmd := exec.CommandContext(ctx, "xfs_quota", "-x", "-c", fmt.Sprintf("project -s -p %s %s", xfsq.Path, pid))
+	glog.V(3).Infof("setting prjquota proj_id=%s path=%s", pid, xfsq.Path)
+
+	cmd := exec.CommandContext(ctx, "xfs_quota", "-x", "-c", fmt.Sprintf("project -d 0 -s -p %s %s", xfsq.Path, pid))
 	out, err := cmd.CombinedOutput()
 	if err != nil {
+		glog.Errorf("could not set prjquota proj_id=%s path=%s err=%v", pid, xfsq.Path, err)
 		return fmt.Errorf("SetQuota failed for %s with error: (%v), output: (%s)", xfsq.ProjectID, err, out)
 	}
 
 	cmd = exec.CommandContext(ctx, "xfs_quota", "-x", "-c", fmt.Sprintf("limit -p bhard=%s %s", limitInStr, pid), xfsq.Path)
 	out, err = cmd.CombinedOutput()
 	if err != nil {
+		glog.Errorf("could not set prjquota proj_id=%s path=%s err=%v", pid, xfsq.Path, err)
 		return fmt.Errorf("xfs_quota failed with error: %v, output: %s", err, out)
 	}
+	glog.V(3).Infof("prjquota set successfully proj_id=%s path=%s", pid, xfsq.Path)
 
 	return nil
 }
@@ -112,12 +134,18 @@ func ParseQuotaList(output, projectID string) (XFSVolumeStats, error) {
 	var pErr error
 	var f float64
 	lines := strings.Split(output, "\n")
-	for _, line := range lines {
+	prjFound := false
+	for _, l := range lines {
+		line := strings.TrimSpace(l)
 		if len(line) == 0 {
 			continue
 		}
-		cleanLine := strings.TrimSpace(line)
-		splits := strings.Split(cleanLine, " ")
+		if !strings.HasPrefix(line, "#"+projectID) {
+			continue
+		}
+		prjFound = true
+
+		splits := strings.Split(line, " ")
 		var values []string
 		for _, split := range splits {
 			tSplit := strings.TrimSpace(split)
@@ -140,6 +168,11 @@ func ParseQuotaList(output, projectID string) (XFSVolumeStats, error) {
 			totalInBytes = int64(f)
 			break
 		}
+		break
+	}
+
+	if !prjFound {
+		return XFSVolumeStats{}, ErrProjNotFound
 	}
 	return XFSVolumeStats{
 		AvailableBytes: totalInBytes - usedInBytes,