fix parse mount path

Signed-off-by: zwwhdls <[email protected]>

pkg/util/util.go

@@ -276,13 +276,7 @@ func GetReferenceKey(target string) string {
 // ParseMntPath return mntPath, volumeId (/jfs/volumeId, volumeId err)
 func ParseMntPath(cmd string) (string, string, error) {
 	cmds := strings.Split(cmd, "\n")
-	if len(cmds) > 2 {
-		return "", "", fmt.Errorf("err cmd:%s", cmd)
-	}
-	mountCmd := cmds[0]
-	if len(cmds) == 2 {
-		mountCmd = cmds[1]
-	}
+	mountCmd := cmds[len(cmds)-1]
 	args := strings.Fields(mountCmd)
 	if len(args) < 3 || !strings.HasPrefix(args[2], config.PodMountBase) {
 		return "", "", fmt.Errorf("err cmd:%s", cmd)

pkg/util/util_test.go

@@ -170,6 +170,17 @@ func TestParseMntPath(t *testing.T) {
 			want1:   "pvc-xxx",
 			wantErr: false,
 		},
+		{
+			name: "with create subpath",
+			args: args{cmd: "/usr/local/bin/juicefs format --storage=s3 --bucket=http://juicefs-bucket.minio.default.svc.cluster.local:9000 --access-key=minioadmin --secret-key=${secretkey} ${metaurl} ce-secret\n" +
+				"/bin/mount.juicefs ${metaurl} /mnt/jfs -o buffer-size=300,cache-size=100,enable-xattr\n" +
+				"if [ ! -d /mnt/jfs/pvc-fb2ec20c-474f-4804-9504-966da4af9b73 ]; then mkdir -m 777 /mnt/jfs/pvc-fb2ec20c-474f-4804-9504-966da4af9b73; fi;\n" +
+				"umount /mnt/jfs\n" +
+				"/bin/mount.juicefs redis://127.0.0.1/6379 /jfs/pvc-xxx"},
+			want:    "/jfs/pvc-xxx",
+			want1:   "pvc-xxx",
+			wantErr: false,
+		},
 		{
 			name:    "err-pod cmd args <3",
 			args:    args{cmd: "/usr/local/bin/juicefs format --storage=s3 --bucket=http://juicefs-bucket.minio.default.svc.cluster.local:9000 --access-key=minioadmin --secret-key=${secretkey} ${metaurl} ce-secret\n/bin/mount.juicefs redis://127.0.0.1/6379"},