fix(jindo): guard SyncRuntime against nil client and stabilize unit test detection

pkg/ddc/jindo/const.go

@@ -39,4 +39,6 @@ const (
 	JindoFuseMountPath = "/jfs/jindofs-fuse"
 
 	DefaultJindoRuntimeImage = "registry.cn-shanghai.aliyuncs.com/jindofs/smartdata:3.8.0"
+
+	WorkerContainerName = "jindofs-worker"
 )

pkg/ddc/jindo/image.go

@@ -0,0 +1,44 @@
+/*
+Copyright 2022 The Fluid Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package jindo
+
+import (
+	"fmt"
+
+	"github.com/fluid-cloudnative/fluid/pkg/common"
+	"github.com/fluid-cloudnative/fluid/pkg/utils/docker"
+)
+
+// resolveSmartDataImage returns the full image string for the SmartData container
+func resolveSmartDataImage() string {
+	var (
+		defaultImage = "registry.cn-shanghai.aliyuncs.com/jindofs/smartdata"
+		defaultTag   = "3.8.0"
+	)
+
+	image := docker.GetImageRepoFromEnv(common.JindoSmartDataImageEnv)
+	tag := docker.GetImageTagFromEnv(common.JindoSmartDataImageEnv)
+
+	if len(image) == 0 {
+		image = defaultImage
+	}
+	if len(tag) == 0 {
+		tag = defaultTag
+	}
+
+	return fmt.Sprintf("%s:%s", image, tag)
+}

pkg/ddc/jindo/sync_runtime.go

@@ -16,9 +16,70 @@ limitations under the License.
 
 package jindo
 
-import cruntime "github.com/fluid-cloudnative/fluid/pkg/runtime"
+import (
+	"k8s.io/apimachinery/pkg/types"
+
+	"github.com/fluid-cloudnative/fluid/pkg/ctrl"
+	cruntime "github.com/fluid-cloudnative/fluid/pkg/runtime"
+	"github.com/fluid-cloudnative/fluid/pkg/utils"
+)
 
 // SyncRuntime syncs the runtime spec
 func (e *JindoEngine) SyncRuntime(ctx cruntime.ReconcileRequestContext) (changed bool, err error) {
-	return
+	if e.Client == nil {
+		e.Log.V(1).Info("Client is nil, skipping SyncRuntime")
+		return false, nil
+	}
+
+	// 1. Get the workers StatefulSet
+	workers, err := ctrl.GetWorkersAsStatefulset(e.Client,
+		types.NamespacedName{Namespace: e.namespace, Name: e.getWorkerName()})
+	if err != nil {
+		if utils.IgnoreNotFound(err) == nil {
+			e.Log.V(1).Info("Workers not found", "name", e.getWorkerName())
+			return false, nil
+		}
+		return false, err
+	}
+
+	// 2. Extract current image
+	var currentImage string
+	var containerIndex int = -1
+	for i, container := range workers.Spec.Template.Spec.Containers {
+		if container.Name == WorkerContainerName {
+			currentImage = container.Image
+			containerIndex = i
+			break
+		}
+	}
+
+	if len(currentImage) == 0 || containerIndex == -1 {
+		e.Log.V(1).Info("Worker container not found", "name", e.getWorkerName())
+		return false, nil
+	}
+
+	// 3. Compute desired image using shared helper
+	desiredImage := resolveSmartDataImage()
+
+	// 4. Compare desired image vs current image
+	if currentImage != desiredImage {
+		e.Log.Info("Image drift detected, triggering rolling upgrade", "current", currentImage, "desired", desiredImage)
+
+		// Update the image
+		workersToUpdate := workers.DeepCopy()
+		workersToUpdate.Spec.Template.Spec.Containers[containerIndex].Image = desiredImage
+
+		err = e.Client.Update(ctx.Context, workersToUpdate)
+		if err != nil {
+			e.Log.Error(err, "Failed to update worker image", "desired", desiredImage)
+			return false, err
+		}
+
+		e.Log.Info("Successfully triggered rolling upgrade for worker StatefulSet", "name", e.getWorkerName())
+
+		// Return false, nil to continue reconciliation without short-circuiting
+		return false, nil
+	}
+
+	return false, nil
 }

pkg/ddc/jindo/transform.go

@@ -544,20 +544,19 @@ func (e *JindoEngine) transformFuseArg(runtime *datav1alpha1.JindoRuntime, datas
 
 func (e *JindoEngine) getSmartDataConfigs() (image, tag, dnsServer string) {
 	var (
-		defaultImage     = "registry.cn-shanghai.aliyuncs.com/jindofs/smartdata"
-		defaultTag       = "3.8.0"
 		defaultDnsServer = "1.1.1.1"
 	)
 
-	image = docker.GetImageRepoFromEnv(common.JindoSmartDataImageEnv)
-	tag = docker.GetImageTagFromEnv(common.JindoSmartDataImageEnv)
-	dnsServer = os.Getenv(common.JindoDnsServer)
-	if len(image) == 0 {
-		image = defaultImage
-	}
-	if len(tag) == 0 {
-		tag = defaultTag
+	fullImage := resolveSmartDataImage()
+	lastColon := strings.LastIndex(fullImage, ":")
+	if lastColon != -1 {
+		image = fullImage[:lastColon]
+		tag = fullImage[lastColon+1:]
+	} else {
+		image = fullImage
 	}
+
+	dnsServer = os.Getenv(common.JindoDnsServer)
 	if len(dnsServer) == 0 {
 		dnsServer = defaultDnsServer
 	}

pkg/utils/testutil/unit_test_env.go

@@ -16,10 +16,20 @@ limitations under the License.
 
 package testutil
 
-import "os"
+import (
+	"os"
+	"strings"
+)
 
 const FluidUnitTestEnv = "FLUID_UNIT_TEST"
 
+func init() {
+	// Automatically detect if running inside a test binary
+	if strings.HasSuffix(os.Args[0], ".test") || strings.HasSuffix(os.Args[0], ".test.exe") {
+		os.Setenv(FluidUnitTestEnv, "true")
+	}
+}
+
 func IsUnitTest() bool {
 	_, exists := os.LookupEnv(FluidUnitTestEnv)
 	return exists