Merge pull request #933 from tydra-wang/fix-ossfs-entrypoint

ossfs entrypoint should not delay termination if no mountpoints
kubernetes-sigs · Dec 21, 2023 · bf3f9ff · bf3f9ff
2 parents fcfe7f8 + c628ec0
commit bf3f9ff
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/build/fuse-clients/ossfs/entrypoint.sh b/build/fuse-clients/ossfs/entrypoint.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 SIGTERM_DELAY="${SIGTERM_DELAY:-60}"
-sigterm_handler() {
+delay_term() {
     echo "Received SIGTERM signal. Delaying termination for ${SIGTERM_DELAY} seconds..."
     while true; do
         if ! kill -0 $INTERNAL_PROCESS_PID 2>/dev/null; then
@@ -17,6 +17,14 @@ sigterm_handler() {
         ((SIGTERM_DELAY--))
     done
 }
+sigterm_handler() {
+    if [ -z $(findmnt -t fuse.ossfs -n -o TARGET) ]; then
+        echo "could not find ossfs mountpoint"
+        exit 1
+    else
+        delay_term
+    fi
+}
 trap 'sigterm_handler' SIGTERM
 ossfs "$@" &
 INTERNAL_PROCESS_PID="$!"

diff --git a/pkg/mounter/ossfs.go b/pkg/mounter/ossfs.go
@@ -20,7 +20,7 @@ import (
 	"k8s.io/utils/pointer"
 )
 
-var defaultOssfsImageTag = "3071afa-aliyun"
+var defaultOssfsImageTag = "705dbf0-aliyun"
 
 const (
 	hostPrefix                = "/host"