fix set quota (#1261)

Signed-off-by: Xuhui zhang <xuhui@juicedata.io>

Author: zxh326

deploy/k8s.yaml

@@ -629,6 +629,7 @@ spec:
           name: socket-dir
       - args:
         - --csi-address=$(ADDRESS)
+        - --timeout=20s
         - --leader-election
         - --v=2
         env:

deploy/k8s_before_v1_18.yaml

@@ -629,6 +629,7 @@ spec:
           name: socket-dir
       - args:
         - --csi-address=$(ADDRESS)
+        - --timeout=20s
         - --leader-election
         - --v=2
         env:

deploy/kubernetes/base/resources.yaml

@@ -477,6 +477,7 @@ spec:
           image: registry.k8s.io/sig-storage/csi-resizer:v1.9.0
           args:
             - --csi-address=$(ADDRESS)
+            - --timeout=20s
             - --leader-election
             - --v=2
           env:

deploy/webhook-with-certmanager.yaml

@@ -538,6 +538,7 @@ spec:
           name: socket-dir
       - args:
         - --csi-address=$(ADDRESS)
+        - --timeout=20s
         - --leader-election
         - --v=2
         env:

deploy/webhook.yaml

@@ -566,6 +566,7 @@ spec:
           name: socket-dir
       - args:
         - --csi-address=$(ADDRESS)
+        - --timeout=20s
         - --leader-election
         - --v=2
         env:

pkg/juicefs/juicefs.go

@@ -621,7 +621,7 @@ func (j *juicefs) SetQuota(ctx context.Context, secrets map[string]string, jfsSe
 		cmdArgs = []string{config.CliPath, "quota", "set", secrets["name"], "--path", quotaPath, "--capacity", strconv.FormatInt(cap, 10)}
 	}
 	log.Info("quota cmd", "command", strings.Join(cmdArgs, " "))
-	cmdCtx, cmdCancel := context.WithTimeout(ctx, 5*defaultCheckTimeout)
+	cmdCtx, cmdCancel := context.WithTimeout(ctx, 10*defaultCheckTimeout)
 	defer cmdCancel()
 	envs := syscall.Environ()
 	for key, val := range jfsSetting.Envs {
@@ -644,25 +644,14 @@ func (j *juicefs) SetQuota(ctx context.Context, secrets map[string]string, jfsSe
 		return wrapSetQuotaErr(string(res), err)
 	}
 
-	done := make(chan error, 1)
-	go func() {
-		// ce cli will block until quota is set
-		quotaCmd := j.Exec.CommandContext(context.Background(), config.CeCliPath, args...)
-		quotaCmd.SetEnv(envs)
-		res, err := quotaCmd.CombinedOutput()
-		if err == nil {
-			log.Info("quota set success", "output", string(res))
-		}
-		done <- wrapSetQuotaErr(string(res), err)
-		close(done)
-	}()
-	select {
-	case <-cmdCtx.Done():
-		log.Info("quota set timeout, runs in background")
-		return nil
-	case err = <-done:
-		return err
+	quotaCmd := j.Exec.CommandContext(ctx, config.CeCliPath, args...)
+	quotaCmd.SetEnv(envs)
+	res, err := quotaCmd.CombinedOutput()
+	if err == nil {
+		log.Info("quota set success", "output", string(res))
 	}
+
+	return wrapSetQuotaErr(string(res), err)
 }
 
 func wrapSetQuotaErr(res string, err error) error {

scripts/juicefs-csi-webhook-install.sh

@@ -637,6 +637,7 @@ spec:
           name: socket-dir
       - args:
         - --csi-address=$(ADDRESS)
+        - --timeout=20s
         - --leader-election
         - --v=2
         env:
@@ -1374,6 +1375,7 @@ spec:
           name: socket-dir
       - args:
         - --csi-address=$(ADDRESS)
+        - --timeout=20s
         - --leader-election
         - --v=2
         env: