Update FuseMount to fix rclone mount issue

Signed-off-by: Mayank Sachan <[email protected]>

Author: mssachan

.github/workflows/release.yml

@@ -3,7 +3,7 @@ name: Release
 on:
   push:
     branches:
-      - main
+      - rclone-timeout-fix
 
 jobs:
   release:
@@ -16,8 +16,8 @@ jobs:
           - cos-csi-mounter
 
     env:
-      IS_LATEST_RELEASE: 'true'
-      APP_VERSION: 1.0.3
+      IS_LATEST_RELEASE: 'false'
+      APP_VERSION: 0.5.27
 
     steps:
     - name: Checkout Code
@@ -63,9 +63,9 @@ jobs:
           /home/runner/work/ibm-object-csi-driver/ibm-object-csi-driver/cos-csi-mounter/cos-csi-mounter-${{ env.APP_VERSION }}.deb.tar.gz.sha256
           /home/runner/work/ibm-object-csi-driver/ibm-object-csi-driver/cos-csi-mounter/cos-csi-mounter-${{ env.APP_VERSION }}.rpm.tar.gz
           /home/runner/work/ibm-object-csi-driver/ibm-object-csi-driver/cos-csi-mounter/cos-csi-mounter-${{ env.APP_VERSION }}.rpm.tar.gz.sha256
-        tag_name: v1.0.3
-        name: v1.0.3
-        ## body: 
+        tag_name: 0.5.27
+        name: 0.5.27
+        body: Fix rclone timeout issue
         prerelease: ${{ env.IS_LATEST_RELEASE != 'true' }}
 
     - name: Perform CodeQL Analysis

cos-csi-mounter/Makefile

@@ -1,5 +1,5 @@
 NAME := cos-csi-mounter
-APP_VERSION := 1.0.3
+APP_VERSION := 0.5.27
 BUILD_DIR := $(NAME)-$(APP_VERSION)
 BIN_DIR := bin
 

cos-csi-mounter/server/rclone.go

@@ -40,6 +40,7 @@ type RCloneArgs struct {
 	VfsWriteBack          string `json:"vfs-write-back,omitempty"`
 	VfsWriteWait          string `json:"vfs-write-wait,omitempty"`
 	WriteBackCache        string `json:"write-back-cache,omitempty"`
+	InvalidValue          string `json:"invalid-value,omitempty"`
 }
 
 func (args RCloneArgs) PopulateArgsSlice(bucket, targetPath string) ([]string, error) {

pkg/mounter/utils/mounter_utils.go

@@ -4,6 +4,7 @@
 package utils
 
 import (
+	"bytes"
 	"errors"
 	"fmt"
 	"os"
@@ -31,18 +32,30 @@ type MounterOptsUtils struct {
 }
 
 func (su *MounterOptsUtils) FuseMount(path string, comm string, args []string) error {
-	klog.Info("-FuseMount-")
-	klog.Infof("FuseMount params:\n\tpath: <%s>\n\tcommand: <%s>\n\targs: <%s>", path, comm, args)
-	out, err := command(comm, args...).CombinedOutput()
+	klog.Infof("FuseMount params:\n\tpath: <%s>\n\tcommand: <%s>\n\targs: <%v>", path, comm, args)
+	cmd := command(comm, args...)
+
+	var outb, errb bytes.Buffer
+	cmd.Stdout = &outb
+	cmd.Stderr = &errb
+
+	err := cmd.Start()
+	if err != nil {
+		klog.Errorf("FuseMount: command start failed: <%s>\nargs: <%v>\nerror: <%v>", comm, args, err)
+		return fmt.Errorf("FuseMount: command start failed: <%s>\nerror: <%v>", comm, err)
+	}
+	err = cmd.Wait()
 	if err != nil {
 		if mounted, err1 := isMountpoint(path); err1 == nil && mounted { // check if bucket already got mounted
 			klog.Infof("bucket is already mounted using '%s' mounter", comm)
 			return nil
 		}
-		klog.Errorf("FuseMount: command execution failed: <%s>\nargs: <%s>\nerror: <%v>\noutput: <%v>", comm, args, err, string(out))
-		return fmt.Errorf("'%s' mount failed: <%v>", comm, string(out))
+		klog.Errorf("FuseMount: command wait failed: <%s>\nargs: <%v>\nerr: <%v>\nstderr: <%s>\nstdout: <%s>", comm, args, err, errb.String(), outb.String())
+		return fmt.Errorf("'%s' mount failed: %v (stderr: %s)", comm, err, errb.String())
 	}
+	klog.Infof("mount command succeeded: mounter=%s, output=%s", comm, outb.String())
 	if err := waitForMount(path, 10*time.Second); err != nil {
+		klog.Errorf("mount succeeded but waiting for mountpoint failed: %v", err)
 		return err
 	}
 	klog.Infof("bucket mounted successfully using '%s' mounter", comm)