fix Copilot

xliuqq · xliuqq · commit df56d2277159 · 2026-04-15T17:04:17.000+08:00
Signed-off-by: xliuqq &lt;xlzq1992@gmail.com&gt;
diff --git a/api/v1alpha1/cacheruntimeclass_types.go b/api/v1alpha1/cacheruntimeclass_types.go
@@ -77,8 +77,8 @@ type ExecutionEntries struct {
 type ExecutionCommonEntry struct {
 	Command []string `json:"command"`
 
-	// Timeout is the timeout(seconds) for the execution entry
-	Timeout int `json:"timeout,omitempty"`
+	// TimeoutSeconds is the timeout(seconds) for the execution entry, at least(default) 20 seconds.
+	TimeoutSeconds int32 `json:"timeout,omitempty"`
 }
 
 // EncryptOptionComponentDependency defines the configuration for encrypt option dependency
diff --git a/api/v1alpha1/openapi_generated.go b/api/v1alpha1/openapi_generated.go
diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/charts/fluid/fluid/crds/data.fluid.io_cacheruntimeclasses.yaml b/charts/fluid/fluid/crds/data.fluid.io_cacheruntimeclasses.yaml
@@ -72,6 +72,7 @@ spec:
                               type: string
                             type: array
                           timeout:
+                            format: int32
                             type: integer
                         required:
                         - command
@@ -83,6 +84,7 @@ spec:
                               type: string
                             type: array
                           timeout:
+                            format: int32
                             type: integer
                         required:
                         - command
@@ -3487,6 +3489,7 @@ spec:
                               type: string
                             type: array
                           timeout:
+                            format: int32
                             type: integer
                         required:
                         - command
@@ -3498,6 +3501,7 @@ spec:
                               type: string
                             type: array
                           timeout:
+                            format: int32
                             type: integer
                         required:
                         - command
@@ -6902,6 +6906,7 @@ spec:
                               type: string
                             type: array
                           timeout:
+                            format: int32
                             type: integer
                         required:
                         - command
@@ -6913,6 +6918,7 @@ spec:
                               type: string
                             type: array
                           timeout:
+                            format: int32
                             type: integer
                         required:
                         - command
diff --git a/config/crd/bases/data.fluid.io_cacheruntimeclasses.yaml b/config/crd/bases/data.fluid.io_cacheruntimeclasses.yaml
@@ -72,6 +72,7 @@ spec:
                               type: string
                             type: array
                           timeout:
+                            format: int32
                             type: integer
                         required:
                         - command
@@ -83,6 +84,7 @@ spec:
                               type: string
                             type: array
                           timeout:
+                            format: int32
                             type: integer
                         required:
                         - command
@@ -3487,6 +3489,7 @@ spec:
                               type: string
                             type: array
                           timeout:
+                            format: int32
                             type: integer
                         required:
                         - command
@@ -3498,6 +3501,7 @@ spec:
                               type: string
                             type: array
                           timeout:
+                            format: int32
                             type: integer
                         required:
                         - command
@@ -6902,6 +6906,7 @@ spec:
                               type: string
                             type: array
                           timeout:
+                            format: int32
                             type: integer
                         required:
                         - command
@@ -6913,6 +6918,7 @@ spec:
                               type: string
                             type: array
                           timeout:
+                            format: int32
                             type: integer
                         required:
                         - command
diff --git a/pkg/common/constants.go b/pkg/common/constants.go
@@ -184,8 +184,6 @@ const (
 	PodRoleType            = "role"
 	DataloadPod            = "dataload-pod"
 	NamespaceFluidSystem   = "fluid-system"
-
-	DefaultNameSpace = "default"
 )
 
 const (
diff --git a/pkg/ddc/cache/engine/client.go b/pkg/ddc/cache/engine/client.go
@@ -82,7 +82,7 @@ func (e *CacheEngine) SetupClientInternal(clientValue *common.CacheRuntimeCompon
 			if len(runtimeToUpdate.Status.Conditions) == 0 {
 				runtimeToUpdate.Status.Conditions = []datav1alpha1.RuntimeCondition{}
 			}
-			cond := utils.NewRuntimeCondition(datav1alpha1.RuntimeMasterInitialized, datav1alpha1.RuntimeMasterInitializedReason,
+			cond := utils.NewRuntimeCondition(datav1alpha1.RuntimeFusesInitialized, datav1alpha1.RuntimeFusesInitializedReason,
 				"The client setup finished.", corev1.ConditionTrue)
 			runtimeToUpdate.Status.Conditions =
 				utils.UpdateRuntimeCondition(runtimeToUpdate.Status.Conditions,
diff --git a/pkg/ddc/cache/engine/cm.go b/pkg/ddc/cache/engine/cm.go
@@ -154,7 +154,7 @@ func (e *CacheEngine) generateRuntimeConfigData(runtime *datav1alpha1.CacheRunti
 		config.Worker = &common.CacheRuntimeComponentConfig{
 			Enabled:  true,
 			Name:     GetComponentName(e.name, common.ComponentTypeWorker),
-			Replicas: runtime.Spec.Master.Replicas,
+			Replicas: runtime.Spec.Worker.Replicas,
 			Options: utils.UnionMapsWithOverride(
 				utils.UnionMapsWithOverride(runtimeClass.Topology.Worker.Options, runtime.Spec.Options), runtime.Spec.Worker.Options),
 		}
@@ -165,10 +165,10 @@ func (e *CacheEngine) generateRuntimeConfigData(runtime *datav1alpha1.CacheRunti
 		}
 	}
 	if !runtime.Spec.Client.Disabled {
-		config.Worker = &common.CacheRuntimeComponentConfig{
-			Enabled:  true,
-			Name:     GetComponentName(e.name, common.ComponentTypeClient),
-			Replicas: runtime.Spec.Master.Replicas,
+		config.Client = &common.CacheRuntimeComponentConfig{
+			Enabled: true,
+			Name:    GetComponentName(e.name, common.ComponentTypeClient),
+			// Replicas: 1,
 			Options: utils.UnionMapsWithOverride(
 				utils.UnionMapsWithOverride(runtimeClass.Topology.Client.Options, runtime.Spec.Options), runtime.Spec.Client.Options),
 		}
diff --git a/pkg/ddc/cache/engine/transform.go b/pkg/ddc/cache/engine/transform.go
@@ -131,8 +131,14 @@ func (e *CacheEngine) addCommonConfigForComponent(commonConfig *CacheRuntimeComp
 	componentDefinition *datav1alpha1.RuntimeComponentDefinition) error {
 	componentValue.PodTemplateSpec.Spec.Volumes = append(componentValue.PodTemplateSpec.Spec.Volumes, commonConfig.RuntimeConfigs.RuntimeConfigVolume)
 
+	if len(componentValue.PodTemplateSpec.Spec.Containers) == 0 {
+		return fmt.Errorf("component %s must define at least one container", componentValue.ComponentType)
+	}
+
 	// assume the first container uses the runtime config
-	componentValue.PodTemplateSpec.Spec.InitContainers[0].VolumeMounts = append(componentValue.PodTemplateSpec.Spec.InitContainers[0].VolumeMounts, commonConfig.RuntimeConfigs.RuntimeConfigVolumeMount)
+	if len(componentValue.PodTemplateSpec.Spec.InitContainers) > 0 {
+		componentValue.PodTemplateSpec.Spec.InitContainers[0].VolumeMounts = append(componentValue.PodTemplateSpec.Spec.InitContainers[0].VolumeMounts, commonConfig.RuntimeConfigs.RuntimeConfigVolumeMount)
+	}
 	componentValue.PodTemplateSpec.Spec.Containers[0].VolumeMounts = append(componentValue.PodTemplateSpec.Spec.Containers[0].VolumeMounts, commonConfig.RuntimeConfigs.RuntimeConfigVolumeMount)
 
 	// other config maps defined in CacheRuntimeClass
diff --git a/pkg/ddc/cache/engine/ufs.go b/pkg/ddc/cache/engine/ufs.go
@@ -34,7 +34,11 @@ func (e *CacheEngine) PrepareUFS(entries *datav1alpha1.ExecutionEntries, value *
 	}
 
 	fileUtils := newCacheFileUtils(podName, containerName, e.namespace, e.Log)
-	err = fileUtils.Mount(mountUfs.Command, time.Duration(mountUfs.Timeout)*time.Second)
+
+	// at least 20 seconds
+	timeoutSeconds := max(mountUfs.TimeoutSeconds, 20)
+
+	err = fileUtils.Mount(mountUfs.Command, time.Duration(timeoutSeconds)*time.Second)
 	if err != nil {
 		return err
 	}
diff --git a/pkg/ddc/cache/engine/worker.go b/pkg/ddc/cache/engine/worker.go
@@ -68,16 +68,16 @@ func (e *CacheEngine) SetupWorkerInternal(workerValue *common.CacheRuntimeCompon
 			return err
 		}
 
-		masterStatus, err := manager.ConstructComponentStatus(context.TODO(), workerValue)
+		workerStatus, err := manager.ConstructComponentStatus(context.TODO(), workerValue)
 		if err != nil {
 			return err
 		}
-		// from RuntimePhaseNone to RuntimePhaseNotReady, not reconcile the master component the next time.
-		masterStatus.Phase = datav1alpha1.RuntimePhaseNotReady
+		// from RuntimePhaseNone to RuntimePhaseNotReady, not reconcile the worker component the next time.
+		workerStatus.Phase = datav1alpha1.RuntimePhaseNotReady
 
 		// TODO: support builds workers affinity ? do it in transformer ?
 		runtimeToUpdate := runtime.DeepCopy()
-		runtimeToUpdate.Status.Master = masterStatus
+		runtimeToUpdate.Status.Worker = workerStatus
 
 		// TODO(cache runtime): why need this line judgement ?
 		if runtime.Status.Worker.Phase == datav1alpha1.RuntimePhaseNone {

Original file line number	Diff line number	Diff line change
`@@ -77,8 +77,8 @@ type ExecutionEntries struct {`
`77`	`77`	`type ExecutionCommonEntry struct {`
`78`	`78`	Command []string `json:"command"`
`79`	`79`
`80`		`- // Timeout is the timeout(seconds) for the execution entry`
`81`		- Timeout int `json:"timeout,omitempty"`
	`80`	`+ // TimeoutSeconds is the timeout(seconds) for the execution entry, at least(default) 20 seconds.`
	`81`	+ TimeoutSeconds int32 `json:"timeout,omitempty"`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`// EncryptOptionComponentDependency defines the configuration for encrypt option dependency`
Original file line number	Diff line number	Diff line change
`@@ -184,8 +184,6 @@ const (`
`184`	`184`	`PodRoleType = "role"`
`185`	`185`	`DataloadPod = "dataload-pod"`
`186`	`186`	`NamespaceFluidSystem = "fluid-system"`
`187`		`-`
`188`		`- DefaultNameSpace = "default"`
`189`	`187`	`)`
`190`	`188`
`191`	`189`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ func (e CacheEngine) SetupClientInternal(clientValue common.CacheRuntimeCompon`
`82`	`82`	`if len(runtimeToUpdate.Status.Conditions) == 0 {`
`83`	`83`	`runtimeToUpdate.Status.Conditions = []datav1alpha1.RuntimeCondition{}`
`84`	`84`	`}`
`85`		`- cond := utils.NewRuntimeCondition(datav1alpha1.RuntimeMasterInitialized, datav1alpha1.RuntimeMasterInitializedReason,`
	`85`	`+ cond := utils.NewRuntimeCondition(datav1alpha1.RuntimeFusesInitialized, datav1alpha1.RuntimeFusesInitializedReason,`
`86`	`86`	`"The client setup finished.", corev1.ConditionTrue)`
`87`	`87`	`runtimeToUpdate.Status.Conditions =`
`88`	`88`	`utils.UpdateRuntimeCondition(runtimeToUpdate.Status.Conditions,`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ func (e CacheEngine) generateRuntimeConfigData(runtime datav1alpha1.CacheRunti`
`154`	`154`	`config.Worker = &common.CacheRuntimeComponentConfig{`
`155`	`155`	`Enabled: true,`
`156`	`156`	`Name: GetComponentName(e.name, common.ComponentTypeWorker),`
`157`		`- Replicas: runtime.Spec.Master.Replicas,`
	`157`	`+ Replicas: runtime.Spec.Worker.Replicas,`
`158`	`158`	`Options: utils.UnionMapsWithOverride(`
`159`	`159`	`utils.UnionMapsWithOverride(runtimeClass.Topology.Worker.Options, runtime.Spec.Options), runtime.Spec.Worker.Options),`
`160`	`160`	`}`
`@@ -165,10 +165,10 @@ func (e CacheEngine) generateRuntimeConfigData(runtime datav1alpha1.CacheRunti`
`165`	`165`	`}`
`166`	`166`	`}`
`167`	`167`	`if !runtime.Spec.Client.Disabled {`
`168`		`- config.Worker = &common.CacheRuntimeComponentConfig{`
`169`		`- Enabled: true,`
`170`		`- Name: GetComponentName(e.name, common.ComponentTypeClient),`
`171`		`- Replicas: runtime.Spec.Master.Replicas,`
	`168`	`+ config.Client = &common.CacheRuntimeComponentConfig{`
	`169`	`+ Enabled: true,`
	`170`	`+ Name: GetComponentName(e.name, common.ComponentTypeClient),`
	`171`	`+ // Replicas: 1,`
`172`	`172`	`Options: utils.UnionMapsWithOverride(`
`173`	`173`	`utils.UnionMapsWithOverride(runtimeClass.Topology.Client.Options, runtime.Spec.Options), runtime.Spec.Client.Options),`
`174`	`174`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,11 @@ func (e CacheEngine) PrepareUFS(entries datav1alpha1.ExecutionEntries, value *`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`fileUtils := newCacheFileUtils(podName, containerName, e.namespace, e.Log)`
`37`		`- err = fileUtils.Mount(mountUfs.Command, time.Duration(mountUfs.Timeout)*time.Second)`
	`37`	`+`
	`38`	`+ // at least 20 seconds`
	`39`	`+ timeoutSeconds := max(mountUfs.TimeoutSeconds, 20)`
	`40`	`+`
	`41`	`+ err = fileUtils.Mount(mountUfs.Command, time.Duration(timeoutSeconds)*time.Second)`
`38`	`42`	`if err != nil {`
`39`	`43`	`return err`
`40`	`44`	`}`