Skip to content

[Bug] fix issue #439 #440

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 6 commits into from
Sep 18, 2025
Merged

[Bug] fix issue #439 #440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e7d480f
[Bug] fix issue #439
ztonny Sep 11, 2025
1a49211
[Bug] fix issue #439
ztonny Sep 18, 2025
62c3ea7
[Bug] fix issue #439
ztonny Sep 18, 2025
53ce8e8
Revert "[Bug] fix issue #439"
ztonny Sep 18, 2025
39222de
Revert "[Bug] fix issue #439"
ztonny Sep 18, 2025
e495120
[Bug] fix issue #439
ztonny Sep 18, 2025
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
5 changes: 3 additions & 2 deletions pkg/common/utils/mysql/mysql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,8 +232,9 @@ func (db *DB) GetBackendsByComputeGroupId(cgid string) ([]*Backend, error) {
return nil, err
}
if _, ok := m[COMPUTE_GROUP_ID]; !ok {
klog.Errorf("GetBackendsByComputeGroupId backends tag get compute_group_name failed, tag: %s, err: %s\n", be.Tag, err.Error())
return nil, err
errMsg := fmt.Sprintf("GetBackendsByComputeGroupId backends tag get compute_group_name failed, tag: %s, err: no compute_group_id field found", be.Tag)
klog.Errorf(errMsg)
return nil, errors.New(errMsg)
}

computegroupId := fmt.Sprintf("%s", m[COMPUTE_GROUP_ID])
Expand Down
9 changes: 6 additions & 3 deletions pkg/common/utils/resource/configmap_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,12 @@
package resource

import (
dorisv1 "github.com/apache/doris-operator/api/doris/v1"
corev1 "k8s.io/api/core/v1"
"reflect"
"strconv"
"testing"

dorisv1 "github.com/apache/doris-operator/api/doris/v1"
corev1 "k8s.io/api/core/v1"
)

func Test_GetStartMode(t *testing.T) {
Expand Down Expand Up @@ -109,8 +110,10 @@ func Test_ResolveConfigMpas(t *testing.T) {
}

m, err := ResolveConfigMaps(tests, dorisv1.Component_FE)
if err != nil || len(m) == 0 {
if err != nil {
t.Errorf("resolve configmaps faild, len=%d, err=%s", len(m), err.Error())
} else if len(m) == 0 {
t.Errorf("resolve configmaps faild, len=%d", len(m))
}
}

Expand Down
7 changes: 4 additions & 3 deletions pkg/controller/sub_controller/disaggregated_cluster/computegroups/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ func (dcgs *DisaggregatedComputeGroupsController) ClearStatefulsetUnusedPVCs(ctx
var perr error
index, perr = strconv.ParseInt(sl[1], 10, 32)
if perr != nil {
klog.Errorf("DisaggregatedComputeGroupsController ClearStatefulsetUnusedPVCs namespace %s name %s index parse failed, err=%s", ddc.Namespace, pvcName, err.Error())
klog.Errorf("DisaggregatedComputeGroupsController ClearStatefulsetUnusedPVCs namespace %s name %s index parse failed, err=%s", ddc.Namespace, pvcName, perr.Error())
continue
}
if int32(index) >= replicas {
Expand Down Expand Up @@ -639,8 +639,9 @@ func(dcgs *DisaggregatedComputeGroupsController) recordComputeGroupIds(ddc *dv1.
return err
}
if _, ok := tags[mysql.COMPUTE_GROUP_ID]; !ok {
klog.Errorf("DisaggregatedComputeGroupsController recordComputeGroupIds backend tag get compute_group_name failed, tag: %s, err: %s", backend.Tag, err.Error())
return err
errMsg := fmt.Sprintf("DisaggregatedComputeGroupsController recordComputeGroupIds backend tag get compute_group_name failed, tag: %s, err: no compute_group_id field found ", backend.Tag)
klog.Errorf(errMsg)
return errors.New(errMsg)
}

podName := strings.Split(backend.Host, ".")[0]
Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/sub_controller/sub_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ func (d *SubDefaultController) CheckSharedPVC(ctx context.Context, dcr *dorisv1.
for _, claim := range dcr.Spec.SharedPersistentVolumeClaims {
pvc, err := k8s.GetPVC(ctx, d.K8sclient, claim.PersistentVolumeClaimName, dcr.Namespace)
if err != nil || pvc == nil {
errMessage := fmt.Sprintf("(PersistentVolumeClaim get failed name: %s, namespace: %s, err: %s), ", claim.PersistentVolumeClaimName, dcr.Namespace, err.Error())
errMessage := fmt.Sprintf("(PersistentVolumeClaim get failed name: %s, namespace: %s, err: %#v), ", claim.PersistentVolumeClaimName, dcr.Namespace, err)
klog.Errorf(errMessage)
d.K8srecorder.Event(dcr, string(EventWarning), string(CheckSharePVC), errMessage)
return
Expand Down Expand Up @@ -555,7 +555,7 @@ func (d *SubDefaultController) listAndDeletePersistentVolumeClaim(ctx context.Co

dorisPersistentVolumes, err := d.GetFinalPersistentVolumes(ctx, dcr, componentType)
if err != nil {
d.K8srecorder.Event(dcr, string(EventWarning), PVCExplainFailed, fmt.Sprintf("listAndDeletePersistentVolumeClaim %s GetFinalPersistentVolumes failed：%s", componentType, err.Error()))
d.K8srecorder.Event(dcr, string(EventWarning), PVCExplainFailed, fmt.Sprintf("listAndDeletePersistentVolumeClaim %s GetFinalPersistentVolumes failed: %s", componentType, err.Error()))
return err
}

Expand Down