refact log

Signed-off-by: zwwhdls <[email protected]>
juicedata · Aug 28, 2024 · d93f213 · d93f213
1 parent 03a6c7f
commit d93f213
Show file tree

Hide file tree

Showing 25 changed files with 79 additions and 21 deletions.
diff --git a/.github/scripts/deploy-csi-in-k8s.sh b/.github/scripts/deploy-csi-in-k8s.sh
@@ -122,7 +122,7 @@ function deploy_webhook() {
   sudo kustomize build ${GITHUB_WORKSPACE}/deploy/kubernetes/csi-ci/webhook >> ${GITHUB_WORKSPACE}/deploy/webhook.yaml
   sudo ${GITHUB_WORKSPACE}/hack/update_install_script.sh
   sudo ${GITHUB_WORKSPACE}/scripts/juicefs-csi-webhook-install.sh print | sed -e "s@juicedata/juicefs-csi-driver.*\$@juicedata/juicefs-csi-driver:${dev_tag}@g" \
-    -e 's@/var/lib/kubelet@/var/snap/microk8s/common/var/lib/kubelet@g' -e 's@--v=5@--v=6@g' -e "s@juicedata/csi-dashboard.*\$@juicedata/csi-dashboard:${dev_tag}@g" | sudo microk8s.kubectl apply -f -
+    -e 's@/var/lib/kubelet@/var/snap/microk8s/common/var/lib/kubelet@g' -e "s@juicedata/csi-dashboard.*\$@juicedata/csi-dashboard:${dev_tag}@g" | sudo microk8s.kubectl apply -f -
   # Wait until the deploy finish
   timeout=0
   while true; do
@@ -161,7 +161,7 @@ function deploy_webhook_provisioner() {
   sudo kustomize build ${GITHUB_WORKSPACE}/deploy/kubernetes/csi-ci/webhook-provisioner > ${GITHUB_WORKSPACE}/deploy/webhook.yaml
   sudo ${GITHUB_WORKSPACE}/hack/update_install_script.sh
   sudo ${GITHUB_WORKSPACE}/scripts/juicefs-csi-webhook-install.sh print | sed -e "s@juicedata/juicefs-csi-driver.*\$@juicedata/juicefs-csi-driver:${dev_tag}@g" \
-    -e 's@/var/lib/kubelet@/var/snap/microk8s/common/var/lib/kubelet@g' -e 's@--v=5@--v=6@g' -e "s@juicedata/csi-dashboard.*\$@juicedata/csi-dashboard:${dev_tag}@g" | sudo microk8s.kubectl apply -f -
+    -e 's@/var/lib/kubelet@/var/snap/microk8s/common/var/lib/kubelet@g' -e "s@juicedata/csi-dashboard.*\$@juicedata/csi-dashboard:${dev_tag}@g" | sudo microk8s.kubectl apply -f -
   # Wait until the deploy finish
   timeout=0
   while true; do

diff --git a/deploy/kubernetes/csi-ci/pod-mount-share/daemonset.yaml b/deploy/kubernetes/csi-ci/pod-mount-share/daemonset.yaml
@@ -12,7 +12,7 @@ spec:
             - --endpoint=$(CSI_ENDPOINT)
             - --logtostderr
             - --nodeid=$(NODE_NAME)
-            - --v=6
+            - --v=1
             - --enable-manager=true
             - --config=/etc/config/config.yaml
           env:

diff --git a/deploy/kubernetes/csi-ci/pod-mount-share/statefulset.yaml b/deploy/kubernetes/csi-ci/pod-mount-share/statefulset.yaml
@@ -14,7 +14,7 @@ spec:
             - --nodeid=$(NODE_NAME)
             - --leader-election
             - --cache-client-conf
-            - --v=6
+            - --v=1
             - --config=/etc/config/config.yaml
           env:
             - name: CSI_ENDPOINT

diff --git a/deploy/kubernetes/csi-ci/pod-provisioner/daemonset.yaml b/deploy/kubernetes/csi-ci/pod-provisioner/daemonset.yaml
@@ -12,6 +12,6 @@ spec:
             - --endpoint=$(CSI_ENDPOINT)
             - --logtostderr
             - --nodeid=$(NODE_NAME)
-            - --v=6
+            - --v=1
             - --enable-manager=true
             - --config=/etc/config/config.yaml
diff --git a/deploy/kubernetes/csi-ci/pod-provisioner/statefulset.yaml b/deploy/kubernetes/csi-ci/pod-provisioner/statefulset.yaml
@@ -13,7 +13,7 @@ spec:
             - --logtostderr
             - --nodeid=$(NODE_NAME)
             - --leader-election
-            - --v=6
+            - --v=1
             - --provisioner=true
             - --config=/etc/config/config.yaml
         - name: csi-provisioner

diff --git a/deploy/kubernetes/csi-ci/pod/daemonset.yaml b/deploy/kubernetes/csi-ci/pod/daemonset.yaml
@@ -12,6 +12,6 @@ spec:
             - --endpoint=$(CSI_ENDPOINT)
             - --logtostderr
             - --nodeid=$(NODE_NAME)
-            - --v=6
+            - --v=1
             - --enable-manager=true
             - --config=/etc/config/config.yaml
diff --git a/deploy/kubernetes/csi-ci/pod/statefulset.yaml b/deploy/kubernetes/csi-ci/pod/statefulset.yaml
@@ -13,5 +13,5 @@ spec:
             - --logtostderr
             - --nodeid=$(NODE_NAME)
             - --leader-election
-            - --v=6
+            - --v=1
             - --config=/etc/config/config.yaml
diff --git a/deploy/kubernetes/csi-ci/process/daemonset.yaml b/deploy/kubernetes/csi-ci/process/daemonset.yaml
@@ -12,6 +12,6 @@ spec:
             - --endpoint=$(CSI_ENDPOINT)
             - --logtostderr
             - --nodeid=$(NODE_NAME)
-            - --v=6
+            - --v=1
             - --by-process=true
             - --config=/etc/config/config.yaml
diff --git a/deploy/kubernetes/csi-ci/process/statefulset.yaml b/deploy/kubernetes/csi-ci/process/statefulset.yaml
@@ -13,6 +13,6 @@ spec:
             - --logtostderr
             - --nodeid=$(NODE_NAME)
             - --leader-election
-            - --v=6
+            - --v=1
             - --by-process=true
             - --config=/etc/config/config.yaml
diff --git a/deploy/kubernetes/csi-ci/webhook-provisioner/statefulset.yaml b/deploy/kubernetes/csi-ci/webhook-provisioner/statefulset.yaml
@@ -13,7 +13,7 @@ spec:
             - --logtostderr
             - --nodeid=$(NODE_NAME)
             - --leader-election
-            - --v=6
+            - --v=1
             - --webhook=true
             - --provisioner=true
             - --config=/etc/config/config.yaml

diff --git a/deploy/kubernetes/csi-ci/webhook/statefulset.yaml b/deploy/kubernetes/csi-ci/webhook/statefulset.yaml
@@ -13,7 +13,7 @@ spec:
             - --logtostderr
             - --nodeid=$(NODE_NAME)
             - --leader-election
-            - --v=6
+            - --v=1
             - --webhook=true
             - --validating-webhook=true
             - --config=/etc/config/config.yaml
diff --git a/deploy/kubernetes/csi-ci/without-kubelet/pod-mount-share/daemonset.yaml b/deploy/kubernetes/csi-ci/without-kubelet/pod-mount-share/daemonset.yaml
@@ -12,7 +12,7 @@ spec:
             - --endpoint=$(CSI_ENDPOINT)
             - --logtostderr
             - --nodeid=$(NODE_NAME)
-            - --v=6
+            - --v=1
             - --enable-manager=true
             - --config=/etc/config/config.yaml
           env:

diff --git a/deploy/kubernetes/csi-ci/without-kubelet/pod-mount-share/statefulset.yaml b/deploy/kubernetes/csi-ci/without-kubelet/pod-mount-share/statefulset.yaml
@@ -14,7 +14,7 @@ spec:
             - --nodeid=$(NODE_NAME)
             - --leader-election
             - --cache-client-conf
-            - --v=6
+            - --v=1
             - --config=/etc/config/config.yaml
           env:
             - name: CSI_ENDPOINT

diff --git a/deploy/kubernetes/csi-ci/without-kubelet/pod-provisioner/daemonset.yaml b/deploy/kubernetes/csi-ci/without-kubelet/pod-provisioner/daemonset.yaml
@@ -12,7 +12,7 @@ spec:
             - --endpoint=$(CSI_ENDPOINT)
             - --logtostderr
             - --nodeid=$(NODE_NAME)
-            - --v=6
+            - --v=1
             - --enable-manager=true
             - --config=/etc/config/config.yaml
           env:

diff --git a/deploy/kubernetes/csi-ci/without-kubelet/pod-provisioner/statefulset.yaml b/deploy/kubernetes/csi-ci/without-kubelet/pod-provisioner/statefulset.yaml
@@ -13,7 +13,7 @@ spec:
             - --logtostderr
             - --nodeid=$(NODE_NAME)
             - --leader-election
-            - --v=6
+            - --v=1
             - --provisioner=true
             - --config=/etc/config/config.yaml
         - name: csi-provisioner

diff --git a/deploy/kubernetes/csi-ci/without-kubelet/pod/daemonset.yaml b/deploy/kubernetes/csi-ci/without-kubelet/pod/daemonset.yaml
@@ -12,7 +12,7 @@ spec:
             - --endpoint=$(CSI_ENDPOINT)
             - --logtostderr
             - --nodeid=$(NODE_NAME)
-            - --v=6
+            - --v=1
             - --enable-manager=true
             - --config=/etc/config/config.yaml
           env:

diff --git a/deploy/kubernetes/csi-ci/without-kubelet/pod/statefulset.yaml b/deploy/kubernetes/csi-ci/without-kubelet/pod/statefulset.yaml
@@ -13,5 +13,5 @@ spec:
             - --logtostderr
             - --nodeid=$(NODE_NAME)
             - --leader-election
-            - --v=6
+            - --v=1
             - --config=/etc/config/config.yaml
diff --git a/pkg/controller/pod_driver.go b/pkg/controller/pod_driver.go
@@ -93,6 +93,7 @@ func (p *PodDriver) SetMountInfo(mit mountInfoTable) {
 }
 
 func (p *PodDriver) Run(ctx context.Context, current *corev1.Pod) (Result, error) {
+	ctx = util.WithLog(ctx, podDriverLog)
 	podStatus := getPodStatus(current)
 	podDriverLog.V(1).Info("start handle pod", "namespace", current.Namespace, "name", current.Name, "status", podStatus)
 	// check refs in mount pod annotation first, delete ref that target pod is not found
@@ -910,7 +911,11 @@ func mkrMp(ctx context.Context, pod corev1.Pod) error {
 		return err
 	}
 	err = util.DoWithTimeout(ctx, 3*time.Second, func() error {
-		return os.MkdirAll(mntPath, 0777)
+		exist, _ := mount.PathExists(mntPath)
+		if !exist {
+			return os.MkdirAll(mntPath, 0777)
+		}
+		return nil
 	})
 	if err != nil {
 		return err

diff --git a/pkg/controller/pod_driver_test.go b/pkg/controller/pod_driver_test.go
@@ -467,6 +467,7 @@ func genMountInfos() []mount.MountInfo {
 }
 
 func TestPodDriver_podReadyHandler(t *testing.T) {
+	defer func() { _ = os.RemoveAll("tmp") }()
 	fuse.InitTestFds()
 	Convey("Test pod ready handler", t, FailureContinues, func() {
 		Convey("pod ready add need recovery ", func() {

diff --git a/pkg/driver/node_test.go b/pkg/driver/node_test.go
@@ -486,6 +486,10 @@ func TestNodeUnpublishVolume(t *testing.T) {
 	metrics := newNodeMetrics(registerer)
 	Convey("Test NodeUnpublishVolume", t, func() {
 		Convey("test normal", func() {
+			patch := ApplyFunc(os.MkdirAll, func(path string, perm os.FileMode) error {
+				return nil
+			})
+			defer patch.Reset()
 			targetPath := "/test/path"
 			volumeId := "vol-test"
 
@@ -516,6 +520,10 @@ func TestNodeUnpublishVolume(t *testing.T) {
 			targetPath := "/test/path"
 			volumeId := "vol-test"
 
+			patch := ApplyFunc(os.MkdirAll, func(path string, perm os.FileMode) error {
+				return nil
+			})
+			defer patch.Reset()
 			mockCtl := gomock.NewController(t)
 			defer mockCtl.Finish()
 

diff --git a/pkg/fuse/passfd.go b/pkg/fuse/passfd.go
@@ -104,7 +104,12 @@ func (fs *Fds) GetFdAddress(ctx context.Context, podHashVal string) (string, err
 	addressInPod := path.Join(fs.basePath, "fuse_fd_csi_comm.sock")
 	// mkdir parent
 	err := util.DoWithTimeout(ctx, 2*time.Second, func() error {
-		return os.MkdirAll(path.Join(fs.basePath, podHashVal), 0777)
+		parentPath := path.Join(fs.basePath, podHashVal)
+		exist, _ := k8sMount.PathExists(parentPath)
+		if !exist {
+			return os.MkdirAll(parentPath, 0777)
+		}
+		return nil
 	})
 	if err != nil {
 		return "", err

diff --git a/pkg/juicefs/juicefs_test.go b/pkg/juicefs/juicefs_test.go
@@ -642,6 +642,10 @@ func Test_juicefs_MountFs(t *testing.T) {
 				return true, nil
 			})
 			defer patch1.Reset()
+			patch := ApplyFunc(os.MkdirAll, func(path string, perm os.FileMode) error {
+				return nil
+			})
+			defer patch.Reset()
 
 			mockCtl := gomock.NewController(t)
 			defer mockCtl.Finish()
@@ -673,6 +677,10 @@ func Test_juicefs_MountFs(t *testing.T) {
 				return true, errors.New("test")
 			})
 			defer patch1.Reset()
+			patch := ApplyFunc(os.MkdirAll, func(path string, perm os.FileMode) error {
+				return nil
+			})
+			defer patch.Reset()
 
 			mockCtl := gomock.NewController(t)
 			defer mockCtl.Finish()
@@ -714,6 +722,10 @@ func Test_juicefs_MountFs(t *testing.T) {
 				return true, nil
 			})
 			defer patch1.Reset()
+			patch := ApplyFunc(os.MkdirAll, func(path string, perm os.FileMode) error {
+				return nil
+			})
+			defer patch.Reset()
 
 			mockCtl := gomock.NewController(t)
 			defer mockCtl.Finish()
@@ -750,6 +762,10 @@ func Test_juicefs_MountFs(t *testing.T) {
 				return true, nil
 			})
 			defer patch1.Reset()
+			patch := ApplyFunc(os.MkdirAll, func(path string, perm os.FileMode) error {
+				return nil
+			})
+			defer patch.Reset()
 
 			mockCtl := gomock.NewController(t)
 			defer mockCtl.Finish()
@@ -786,6 +802,10 @@ func Test_juicefs_MountFs(t *testing.T) {
 				return true, nil
 			})
 			defer patch1.Reset()
+			patch := ApplyFunc(os.MkdirAll, func(path string, perm os.FileMode) error {
+				return nil
+			})
+			defer patch.Reset()
 
 			mockCtl := gomock.NewController(t)
 			defer mockCtl.Finish()
@@ -822,6 +842,10 @@ func Test_juicefs_MountFs(t *testing.T) {
 				return false, nil
 			})
 			defer patch1.Reset()
+			patch := ApplyFunc(os.MkdirAll, func(path string, perm os.FileMode) error {
+				return nil
+			})
+			defer patch.Reset()
 
 			mockCtl := gomock.NewController(t)
 			defer mockCtl.Finish()
@@ -857,6 +881,10 @@ func Test_juicefs_MountFs(t *testing.T) {
 				return false, nil
 			})
 			defer patch1.Reset()
+			patch := ApplyFunc(os.MkdirAll, func(path string, perm os.FileMode) error {
+				return nil
+			})
+			defer patch.Reset()
 
 			mockCtl := gomock.NewController(t)
 			defer mockCtl.Finish()

diff --git a/pkg/juicefs/mount/builder/pod_test.go b/pkg/juicefs/mount/builder/pod_test.go
@@ -19,6 +19,7 @@ package builder
 import (
 	"encoding/json"
 	"fmt"
+	"os"
 	"path"
 	"reflect"
 	"testing"
@@ -208,6 +209,7 @@ func Test_getCacheDirVolumes(t *testing.T) {
 }
 
 func TestNewMountPod(t *testing.T) {
+	defer func() { _ = os.RemoveAll("tmp") }()
 	fuse.InitTestFds()
 	config.NodeName = "node"
 	config.Namespace = ""

diff --git a/pkg/juicefs/mount/pod_mount.go b/pkg/juicefs/mount/pod_mount.go
@@ -339,7 +339,11 @@ func (p *PodMount) createOrAddRef(ctx context.Context, podName string, jfsSettin
 	jfsSetting.SecretName = fmt.Sprintf("juicefs-%s-secret", jfsSetting.UniqueId)
 	// mkdir mountpath
 	err = util.DoWithTimeout(ctx, 3*time.Second, func() error {
-		return os.MkdirAll(jfsSetting.MountPath, 0777)
+		exist, _ := k8sMount.PathExists(jfsSetting.MountPath)
+		if !exist {
+			return os.MkdirAll(jfsSetting.MountPath, 0777)
+		}
+		return nil
 	})
 	if err != nil {
 		return

diff --git a/pkg/juicefs/mount/pod_mount_test.go b/pkg/juicefs/mount/pod_mount_test.go
@@ -274,6 +274,7 @@ func TestAddRefOfMountWithMock(t *testing.T) {
 }
 
 func TestJUmount(t *testing.T) {
+	defer func() { _ = os.RemoveAll("tmp") }()
 	fakeClientSet := fake.NewSimpleClientset()
 	fuse.InitTestFds()
 
@@ -740,6 +741,10 @@ func TestJMount(t *testing.T) {
 				return mocks.FakeFileInfoIno1{}, nil
 			})
 			defer patch5.Reset()
+			patch := ApplyFunc(os.MkdirAll, func(path string, perm os.FileMode) error {
+				return nil
+			})
+			defer patch.Reset()
 
 			fakeClient := fake.NewSimpleClientset()
 			p := NewPodMount(&k8sclient.K8sClient{Interface: fakeClient}, mount.SafeFormatAndMount{