Skip to content

[feature](ddc) enable DDC workload group #378

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 23, 2025
Merged

[feature](ddc) enable DDC workload group #378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions api/disaggregated/v1/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,13 @@ type ComputeGroup struct {
//the unique identifier of compute group, first register in fe will use UniqueId as cluster name.
UniqueId string `json:"uniqueId"`

// EnableWorkloadGroup is a switch that determines whether the doris cluster enables the workload group.
// Default value is 'false'.
// Enabling it means that the container must be started in privileged mode.
// Please confirm whether the host machine and k8s cluster allow it.
// Doris workloadgroup reference document: https://doris.apache.org/docs/admin-manual/resource-admin/workload-group
EnableWorkloadGroup bool `json:"enableWorkloadGroup,omitempty"`

CommonSpec `json:",inline"`
}

Expand Down
16 changes: 16 additions & 0 deletions pkg/controller/sub_controller/disaggregated_cluster/computegroups/statefulset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,14 @@
package computegroups

import (
"fmt"
dv1 "github.com/apache/doris-operator/api/disaggregated/v1"
"github.com/apache/doris-operator/pkg/common/utils/resource"
sub "github.com/apache/doris-operator/pkg/controller/sub_controller"
appv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/pointer"
"strconv"
)

Expand Down Expand Up @@ -120,6 +122,14 @@ func (dcgs *DisaggregatedComputeGroupsController) NewPodTemplateSpec(ddc *dv1.Do
}

func (dcgs *DisaggregatedComputeGroupsController) NewCGContainer(ddc *dv1.DorisDisaggregatedCluster, cvs map[string]interface{}, cg *dv1.ComputeGroup) corev1.Container {

if cg.EnableWorkloadGroup {
if cg.ContainerSecurityContext == nil {
cg.ContainerSecurityContext = &corev1.SecurityContext{}
}
cg.ContainerSecurityContext.Privileged = pointer.Bool(true)
}

c := resource.NewContainerWithCommonSpec(&cg.CommonSpec)
c.Lifecycle = resource.LifeCycleWithPreStopScript(c.Lifecycle, sub.GetDisaggregatedPreStopScript(dv1.DisaggregatedBE))
cmd, args := sub.GetDisaggregatedCommand(dv1.DisaggregatedBE)
Expand Down Expand Up @@ -183,5 +193,11 @@ func (dcgs *DisaggregatedComputeGroupsController) newSpecificEnvs(ddc *dv1.Doris
)
}

if cg.EnableWorkloadGroup {
cgEnvs = append(cgEnvs,
corev1.EnvVar{Name: resource.ENABLE_WORKLOAD_GROUP, Value: fmt.Sprintf("%t", cg.EnableWorkloadGroup)},
)
}

return cgEnvs
}