Skip to content

Commit ca8803f

Browse files
authored
Merge pull request #460 from gohalo/fix_runmode_debug
[feat] support run_mode=debug for ddc fe and ms
2 parents 40b573b + 137ba11 commit ca8803f

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,9 @@ func (dfc *DisaggregatedFEController) initialFEStatus(ddc *v1.DorisDisaggregated
275275
func (dfc *DisaggregatedFEController) reconcileStatefulset(ctx context.Context, st *appv1.StatefulSet, cluster *v1.DorisDisaggregatedCluster) (*sc.Event, error) {
276276
var est appv1.StatefulSet
277277
if err := dfc.K8sclient.Get(ctx, types.NamespacedName{Namespace: st.Namespace, Name: st.Name}, &est); apierrors.IsNotFound(err) {
278+
// add downlaodAPI volume Mounts
279+
dfc.DisaggregatedSubDefaultController.AddDownwardAPI(st)
280+
278281
if err = k8s.CreateClientObject(ctx, dfc.K8sclient, st); err != nil {
279282
klog.Errorf("disaggregatedFEController reconcileStatefulset create statefulset namespace=%s name=%s failed, err=%s", st.Namespace, st.Name, err.Error())
280283
return &sc.Event{Type: sc.EventWarning, Reason: sc.FECreateResourceFailed, Message: err.Error()}, err
@@ -330,6 +333,7 @@ func (dfc *DisaggregatedFEController) reconcileStatefulset(ctx context.Context,
330333
ddc_annos := (resource.Annotations)(cluster.Annotations)
331334
msUniqueIdKey := strings.ToLower(fmt.Sprintf(v1.UpdateStatefulsetName, cluster.GetFEStatefulsetName()))
332335
ddc_annos.Add(msUniqueIdKey, "true")
336+
dfc.DisaggregatedSubDefaultController.AddDownwardAPI(st)
333337
}
334338
return equal
335339
}); err != nil {

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,9 @@ func (dms *DisaggregatedMSController) Sync(ctx context.Context, obj client.Objec
196196
func (dms *DisaggregatedMSController) reconcileStatefulset(ctx context.Context, st *appv1.StatefulSet, ddc *v1.DorisDisaggregatedCluster) (*sc.Event, error) {
197197
var est appv1.StatefulSet
198198
if err := dms.K8sclient.Get(ctx, types.NamespacedName{Namespace: st.Namespace, Name: st.Name}, &est); apierrors.IsNotFound(err) {
199+
// add downlaodAPI volume Mounts
200+
dms.DisaggregatedSubDefaultController.AddDownwardAPI(st)
201+
199202
if err = k8s.CreateClientObject(ctx, dms.K8sclient, st); err != nil {
200203
klog.Errorf("dms controller reconcileStatefulset create statefulset namespace=%s name=%s failed, err=%s", st.Namespace, st.Name, err.Error())
201204
return &sc.Event{Type: sc.EventWarning, Reason: sc.CGCreateResourceFailed, Message: err.Error()}, err
@@ -224,6 +227,7 @@ func (dms *DisaggregatedMSController) reconcileStatefulset(ctx context.Context,
224227
ddc_annos := (resource.Annotations)(ddc.Annotations)
225228
msUniqueIdKey := strings.ToLower(fmt.Sprintf(v1.UpdateStatefulsetName, ddc.GetMSStatefulsetName()))
226229
ddc_annos.Add(msUniqueIdKey, "true")
230+
dms.DisaggregatedSubDefaultController.AddDownwardAPI(st)
227231
}
228232

229233
return equal

0 commit comments

Comments
 (0)