Merge branch 'main' into add-fuse3-winfsp

Seagate · Jan 27, 2025 · 8a8e73b · 8a8e73b
2 parents 577f34f + 707931f
commit 8a8e73b
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 18 deletions.
diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml
@@ -16,8 +16,9 @@ jobs:
   BuildAndTest-Coverage:
     strategy:
       matrix:
-        go: ["1.23.2"]
+        go: ["1.23"]
         job_name: ["linux-fuse3", "linux-fuse2"]
+
         include:
           - job_name: linux-fuse3
             os: ubuntu-latest
@@ -545,7 +546,7 @@ jobs:
   BuildAndTest-Coverage-Windows:
     strategy:
       matrix:
-        go: ["1.23.2"]
+        go: ["1.23"]
         job_name: ["windows"]
 
         include:
@@ -1029,7 +1030,7 @@ jobs:
       - BuildAndTest-Coverage-Windows
     strategy:
       matrix:
-        go: ["1.23.2"]
+        go: ["1.23"]
         job_name: ["linux"]
 
         include:

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -52,7 +52,7 @@ jobs:
         if: matrix.language == 'go'
         uses: actions/setup-go@v5
         with:
-          go-version: "1.23.2"
+          go-version: "1.23"
           check-latest: true
 
       - name: Go Version

diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -69,7 +69,7 @@ jobs:
     needs: compile-gui
     runs-on: windows-latest
     env:
-      go: "1.23.2"
+      go: "1.23"
       cgo: "0"
       winfsp: winfsp-2.0.23075.msi
     steps:
@@ -185,7 +185,7 @@ jobs:
     needs: create-installer
     runs-on: ubuntu-latest
     env:
-      go: "1.23.2"
+      go: "1.23"
       zig: 0.13.0
 
     steps:

diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -19,7 +19,7 @@ jobs:
     name: Build and Test on Linux
     strategy:
       matrix:
-        go: ["1.23.2"]
+        go: ["1.23"]
         job_name: ["linux-fuse3", "linux-fuse2"]
         include:
           - job_name: linux-fuse3
@@ -144,7 +144,7 @@ jobs:
     name: Build and Test on Windows
     runs-on: windows-latest
     env:
-      go: "1.23.2"
+      go: "1.23"
       cgo: "0"
       containerName: "test-cnt-win"
 
@@ -178,7 +178,7 @@ jobs:
     name: Lint
     runs-on: ubuntu-latest
     env:
-      go: "1.23.2"
+      go: "1.23"
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

diff --git a/cmd/mount_linux.go b/cmd/mount_linux.go
@@ -73,7 +73,12 @@ func createDaemon(pipeline *internal.Pipeline, ctx context.Context, pidFileName
 
 	log.Debug("mount: foreground disabled, child = %v", daemon.WasReborn())
 	if child == nil { // execute in child only
-		defer dmnCtx.Release() // nolint
+		defer func() {
+			if err := dmnCtx.Release(); err != nil {
+				log.Err("Unable to release pid-file: %s", err.Error())
+			}
+		}()
+
 		setGOConfig()
 		go startDynamicProfiler()
 
@@ -95,8 +100,11 @@ func createDaemon(pipeline *internal.Pipeline, ctx context.Context, pidFileName
 			if err != nil {
 				log.Err("mount: failed to read child [%v] failure logs [%s]", child.Pid, err.Error())
 				return Destroy(fmt.Sprintf("failed to mount, please check logs [%s]", err.Error()))
-			} else {
+			} else if len(buff) > 0 {
 				return Destroy(string(buff))
+			} else {
+				// Nothing was logged, so mount succeeded
+				return nil
 			}
 
 		case <-time.After(options.WaitForMount):

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/Seagate/cloudfuse
 
-go 1.23.2
+go 1.23
 
 require (
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0
@@ -21,7 +21,7 @@ require (
 	github.com/montanaflynn/stats v0.7.1
 	github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58
 	github.com/radovskyb/watcher v1.0.7
-	github.com/sevlyar/go-daemon v0.1.6
+	github.com/sevlyar/go-daemon v0.1.7-0.20240723083326-c2a11b2b57fc
 	github.com/shirou/gopsutil/v3 v3.24.5
 	github.com/spf13/cobra v1.8.1
 	github.com/spf13/pflag v1.0.5
@@ -78,7 +78,7 @@ require (
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/crypto v0.32.0 // indirect
-	golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 // indirect
+	golang.org/x/exp v0.0.0-20241210194714-1829a127f884 // indirect
 	golang.org/x/net v0.34.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect

diff --git a/go.sum b/go.sum
@@ -129,8 +129,8 @@ github.com/sagikazarmark/locafero v0.6.0 h1:ON7AQg37yzcRPU69mt7gwhFEBwxI6P9T4Qu3
 github.com/sagikazarmark/locafero v0.6.0/go.mod h1:77OmuIc6VTraTXKXIs/uvUxKGUXjE1GbemJYHqdNjX0=
 github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE=
 github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ=
-github.com/sevlyar/go-daemon v0.1.6 h1:EUh1MDjEM4BI109Jign0EaknA2izkOyi0LV3ro3QQGs=
-github.com/sevlyar/go-daemon v0.1.6/go.mod h1:6dJpPatBT9eUwM5VCw9Bt6CdX9Tk6UWvhW3MebLDRKE=
+github.com/sevlyar/go-daemon v0.1.7-0.20240723083326-c2a11b2b57fc h1:/StamxKd71C89UI6Vo7NXg8zu6eHxj/jgxdwAVRqP9Q=
+github.com/sevlyar/go-daemon v0.1.7-0.20240723083326-c2a11b2b57fc/go.mod h1:XFAAg6dLmyBIYW7Gss91IQoNmbvZXAVdrXRP9u9AQu8=
 github.com/shirou/gopsutil/v3 v3.24.5 h1:i0t8kL+kQTvpAYToeuiVk3TgDeKOFioZO3Ztz/iZ9pI=
 github.com/shirou/gopsutil/v3 v3.24.5/go.mod h1:bsoOS1aStSs9ErQ1WWfxllSeS1K5D+U30r2NfcubMVk=
 github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
@@ -170,8 +170,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
 golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
-golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 h1:kx6Ds3MlpiUHKj7syVnbp57++8WpuKPcR5yjLBjvLEA=
-golang.org/x/exp v0.0.0-20240823005443-9b4947da3948/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ=
+golang.org/x/exp v0.0.0-20241210194714-1829a127f884 h1:Y/Mj/94zIQQGHVSv1tTtQBDaQaJe62U9bkDZKKyhPCU=
+golang.org/x/exp v0.0.0-20241210194714-1829a127f884/go.mod h1:qj5a5QZpwLU2NLQudwIN5koi3beDhSAlJwa67PuM98c=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -190,6 +190,7 @@ golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
 golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=