ddc-skip-default-systeminit

Author: catpineapple

api/disaggregated/v1/types.go

@@ -90,6 +90,12 @@ type ComputeGroup struct {
 	UniqueId string `json:"uniqueId"`
 
 	CommonSpec `json:",inline"`
+
+	// SkipDefaultSystemInit is a switch that skips the default initialization and is used to set the default environment configuration required by the doris BE node.
+	// Default value is 'false'.
+	// Default System Init means that the container must be started in privileged mode.
+	// Default System Init configuration is implemented through the initContainers of the pod, so changes to this configuration may be ignored by k8s when it is not the first deployment.
+	SkipDefaultSystemInit bool `json:"skipDefaultSystemInit,omitempty"`
 }
 
 type CommonSpec struct {

pkg/common/utils/resource/pod.go

@@ -190,7 +190,7 @@ func NewPodTemplateSpec(dcr *v1.DorisCluster, config map[string]interface{}, com
 }
 
 // for disaggregated cluster.
-func NewPodTemplateSpecWithCommonSpec(cs *dv1.CommonSpec, componentType dv1.DisaggregatedComponentType) corev1.PodTemplateSpec {
+func NewPodTemplateSpecWithCommonSpec(skipInit bool, cs *dv1.CommonSpec, componentType dv1.DisaggregatedComponentType) corev1.PodTemplateSpec {
 	var vs []corev1.Volume
 	si := cs.SystemInitialization
 	var defaultInitContainers []corev1.Container
@@ -214,7 +214,7 @@ func NewPodTemplateSpecWithCommonSpec(cs *dv1.CommonSpec, componentType dv1.Disa
 			Volumes:            vs,
 		},
 	}
-	constructDisaggregatedInitContainers(componentType, &pts.Spec, si)
+	constructDisaggregatedInitContainers(skipInit, componentType, &pts.Spec, si)
 	return pts
 }
 
@@ -264,7 +264,7 @@ func constructInitContainers(skipInit bool, componentType v1.ComponentType, podS
 	podSpec.InitContainers = append(podSpec.InitContainers, defaultInitContains...)
 }
 
-func constructDisaggregatedInitContainers(componentType dv1.DisaggregatedComponentType, podSpec *corev1.PodSpec, si *dv1.SystemInitialization) {
+func constructDisaggregatedInitContainers(skipInit bool, componentType dv1.DisaggregatedComponentType, podSpec *corev1.PodSpec, si *dv1.SystemInitialization) {
 	initImage := DEFAULT_INIT_IMAGE
 	var defaultInitContains []corev1.Container
 	if si != nil {
@@ -287,7 +287,7 @@ func constructDisaggregatedInitContainers(componentType dv1.DisaggregatedCompone
 	}
 
 	// the init containers have sequence，should confirm use initial is always in the first priority.
-	if componentType == dv1.DisaggregatedBE {
+	if !skipInit && componentType == dv1.DisaggregatedBE {
 		podSpec.InitContainers = append(podSpec.InitContainers, constructBeDefaultInitContainer(initImage))
 	}
 	podSpec.InitContainers = append(podSpec.InitContainers, defaultInitContains...)

pkg/common/utils/resource/pod_test.go

@@ -122,7 +122,7 @@ func Test_NewPodTemplateSpecWithCommonSpec(t *testing.T) {
 	tm[dv1.DisaggregatedMS] = mcs
 
 	for dct, cs := range tm {
-		pts := NewPodTemplateSpecWithCommonSpec(cs, dct)
+		pts := NewPodTemplateSpecWithCommonSpec(false, cs, dct)
 		t.Log(pts)
 	}
 }

pkg/controller/sub_controller/disaggregated_cluster/computegroups/statefulset.go

@@ -81,7 +81,7 @@ func (dcgs *DisaggregatedComputeGroupsController) NewStatefulset(ddc *dv1.DorisD
 }
 
 func (dcgs *DisaggregatedComputeGroupsController) NewPodTemplateSpec(ddc *dv1.DorisDisaggregatedCluster, selector map[string]string, cvs map[string]interface{}, cg *dv1.ComputeGroup) corev1.PodTemplateSpec {
-	pts := resource.NewPodTemplateSpecWithCommonSpec(&cg.CommonSpec, dv1.DisaggregatedBE)
+	pts := resource.NewPodTemplateSpecWithCommonSpec(cg.SkipDefaultSystemInit, &cg.CommonSpec, dv1.DisaggregatedBE)
 	//pod template metadata.
 	func() {
 		l := (resource.Labels)(selector)
@@ -132,6 +132,12 @@ func (dcgs *DisaggregatedComputeGroupsController) NewCGContainer(ddc *dv1.DorisD
 	c.Env = append(c.Env, resource.GetPodDefaultEnv()...)
 	c.Env = append(c.Env, dcgs.newSpecificEnvs(ddc, cg)...)
 
+	if cg.SkipDefaultSystemInit {
+		// Only works when the doris version is higher than 2.1.8 or 3.0.4
+		// When the environment variable SKIP_CHECK_ULIMIT=true is passed in, the start_be.sh will not check system parameters like ulimit and vm.max_map_count etc.
+		c.Env = append(c.Env, corev1.EnvVar{Name: "SKIP_CHECK_ULIMIT", Value: "true"})
+	}
+
 	resource.BuildDisaggregatedProbe(&c, &cg.CommonSpec, dv1.DisaggregatedBE)
 	_, vms, _ := dcgs.BuildVolumesVolumeMountsAndPVCs(cvs, dv1.DisaggregatedBE, &cg.CommonSpec)
 	_, cmvms := dcgs.BuildDefaultConfigMapVolumesVolumeMounts(cg.ConfigMaps)

pkg/controller/sub_controller/disaggregated_cluster/disaggregated_fe/statefulset.go

@@ -86,7 +86,7 @@ func (dfc *DisaggregatedFEController) getFEPodLabels(ddc *v1.DorisDisaggregatedC
 }
 
 func (dfc *DisaggregatedFEController) NewPodTemplateSpec(ddc *v1.DorisDisaggregatedCluster, confMap map[string]interface{}) corev1.PodTemplateSpec {
-	pts := resource.NewPodTemplateSpecWithCommonSpec(&ddc.Spec.FeSpec.CommonSpec, v1.DisaggregatedFE)
+	pts := resource.NewPodTemplateSpecWithCommonSpec(false, &ddc.Spec.FeSpec.CommonSpec, v1.DisaggregatedFE)
 	//pod template metadata.
 	labels := dfc.getFEPodLabels(ddc)
 	pts.Labels = labels

pkg/controller/sub_controller/disaggregated_cluster/metaservice/statefulset.go

@@ -88,7 +88,7 @@ func (dms *DisaggregatedMSController) newStatefulset(ddc *v1.DorisDisaggregatedC
 }
 
 func (dms *DisaggregatedMSController) NewPodTemplateSpec(ddc *v1.DorisDisaggregatedCluster, selector map[string]string, confMap map[string]interface{}) corev1.PodTemplateSpec {
-	pts := resource.NewPodTemplateSpecWithCommonSpec(&ddc.Spec.MetaService.CommonSpec, v1.DisaggregatedMS)
+	pts := resource.NewPodTemplateSpecWithCommonSpec(false, &ddc.Spec.MetaService.CommonSpec, v1.DisaggregatedMS)
 	//pod template metadata.
 	func() {
 		l := (resource.Labels)(selector)