Skip to content

Commit e495120

Browse files
committed
[Bug] fix issue #439
use klog to print log message and drop %#v for err;
1 parent 39222de commit e495120

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

pkg/common/utils/mysql/mysql.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,9 @@ func (db *DB) GetBackendsByComputeGroupId(cgid string) ([]*Backend, error) {
232232
return nil, err
233233
}
234234
if _, ok := m[COMPUTE_GROUP_ID]; !ok {
235-
return nil, fmt.Errorf("GetBackendsByComputeGroupId backends tag get compute_group_name failed, tag: %s, err: no compute_group_id field found", be.Tag)
235+
errMsg := fmt.Sprintf("GetBackendsByComputeGroupId backends tag get compute_group_name failed, tag: %s, err: no compute_group_id field found", be.Tag)
236+
klog.Errorf(errMsg)
237+
return nil, errors.New(errMsg)
236238
}
237239

238240
computegroupId := fmt.Sprintf("%s", m[COMPUTE_GROUP_ID])

pkg/common/utils/resource/configmap_test.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,12 @@
1818
package resource
1919

2020
import (
21-
dorisv1 "github.com/apache/doris-operator/api/doris/v1"
22-
corev1 "k8s.io/api/core/v1"
2321
"reflect"
2422
"strconv"
2523
"testing"
24+
25+
dorisv1 "github.com/apache/doris-operator/api/doris/v1"
26+
corev1 "k8s.io/api/core/v1"
2627
)
2728

2829
func Test_GetStartMode(t *testing.T) {
@@ -109,8 +110,10 @@ func Test_ResolveConfigMpas(t *testing.T) {
109110
}
110111

111112
m, err := ResolveConfigMaps(tests, dorisv1.Component_FE)
112-
if err != nil || len(m) == 0 {
113-
t.Errorf("resolve configmaps faild, len=%d, err=%#v", len(m), err)
113+
if err != nil {
114+
t.Errorf("resolve configmaps faild, len=%d, err=%s", len(m), err.Error())
115+
} else if len(m) == 0 {
116+
t.Errorf("resolve configmaps faild, len=%d", len(m))
114117
}
115118
}
116119

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,9 @@ func(dcgs *DisaggregatedComputeGroupsController) recordComputeGroupIds(ddc *dv1.
639639
return err
640640
}
641641
if _, ok := tags[mysql.COMPUTE_GROUP_ID]; !ok {
642-
return fmt.Errorf("DisaggregatedComputeGroupsController recordComputeGroupIds backend tag get compute_group_name failed, tag: %s, err: no compute_group_id field found ", backend.Tag)
642+
errMsg := fmt.Sprintf("DisaggregatedComputeGroupsController recordComputeGroupIds backend tag get compute_group_name failed, tag: %s, err: no compute_group_id field found ", backend.Tag)
643+
klog.Errorf(errMsg)
644+
return errors.New(errMsg)
643645
}
644646

645647
podName := strings.Split(backend.Host, ".")[0]

0 commit comments

Comments
 (0)