Skip to content

Commit 39222de

Browse files
committed
Revert "[Bug] fix issue #439"
This reverts commit 1a49211.
1 parent 53ce8e8 commit 39222de

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

pkg/common/utils/mysql/mysql.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -232,9 +232,7 @@ func (db *DB) GetBackendsByComputeGroupId(cgid string) ([]*Backend, error) {
232232
return nil, err
233233
}
234234
if _, ok := m[COMPUTE_GROUP_ID]; !ok {
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)
235+
return nil, fmt.Errorf("GetBackendsByComputeGroupId backends tag get compute_group_name failed, tag: %s, err: no compute_group_id field found", be.Tag)
238236
}
239237

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

pkg/common/utils/resource/configmap_test.go

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

2020
import (
21+
dorisv1 "github.com/apache/doris-operator/api/doris/v1"
22+
corev1 "k8s.io/api/core/v1"
2123
"reflect"
2224
"strconv"
2325
"testing"
24-
25-
dorisv1 "github.com/apache/doris-operator/api/doris/v1"
26-
corev1 "k8s.io/api/core/v1"
2726
)
2827

2928
func Test_GetStartMode(t *testing.T) {
@@ -110,10 +109,8 @@ func Test_ResolveConfigMpas(t *testing.T) {
110109
}
111110

112111
m, err := ResolveConfigMaps(tests, dorisv1.Component_FE)
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))
112+
if err != nil || len(m) == 0 {
113+
t.Errorf("resolve configmaps faild, len=%d, err=%#v", len(m), err)
117114
}
118115
}
119116

0 commit comments

Comments
 (0)