Skip to content

Commit e7d480f

Browse files
committed
[Bug] fix issue #439
in some cases, err.Error() will be called when err is nil, fix it;
1 parent 2b458b8 commit e7d480f

File tree

4 files changed

+6
-8
lines changed

4 files changed

+6
-8
lines changed

pkg/common/utils/mysql/mysql.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,8 +232,7 @@ func (db *DB) GetBackendsByComputeGroupId(cgid string) ([]*Backend, error) {
232232
return nil, err
233233
}
234234
if _, ok := m[COMPUTE_GROUP_ID]; !ok {
235-
klog.Errorf("GetBackendsByComputeGroupId backends tag get compute_group_name failed, tag: %s, err: %s\n", be.Tag, err.Error())
236-
return nil, err
235+
return nil, fmt.Errorf("GetBackendsByComputeGroupId backends tag get compute_group_name failed, tag: %s, err: no compute_group_id field found", be.Tag)
237236
}
238237

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

pkg/common/utils/resource/configmap_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ func Test_ResolveConfigMpas(t *testing.T) {
110110

111111
m, err := ResolveConfigMaps(tests, dorisv1.Component_FE)
112112
if err != nil || len(m) == 0 {
113-
t.Errorf("resolve configmaps faild, len=%d, err=%s", len(m), err.Error())
113+
t.Errorf("resolve configmaps faild, len=%d, err=%#v", len(m), err)
114114
}
115115
}
116116

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ func (dcgs *DisaggregatedComputeGroupsController) ClearStatefulsetUnusedPVCs(ctx
524524
var perr error
525525
index, perr = strconv.ParseInt(sl[1], 10, 32)
526526
if perr != nil {
527-
klog.Errorf("DisaggregatedComputeGroupsController ClearStatefulsetUnusedPVCs namespace %s name %s index parse failed, err=%s", ddc.Namespace, pvcName, err.Error())
527+
klog.Errorf("DisaggregatedComputeGroupsController ClearStatefulsetUnusedPVCs namespace %s name %s index parse failed, err=%s", ddc.Namespace, pvcName, perr.Error())
528528
continue
529529
}
530530
if int32(index) >= replicas {
@@ -639,8 +639,7 @@ func(dcgs *DisaggregatedComputeGroupsController) recordComputeGroupIds(ddc *dv1.
639639
return err
640640
}
641641
if _, ok := tags[mysql.COMPUTE_GROUP_ID]; !ok {
642-
klog.Errorf("DisaggregatedComputeGroupsController recordComputeGroupIds backend tag get compute_group_name failed, tag: %s, err: %s", backend.Tag, err.Error())
643-
return err
642+
return fmt.Errorf("DisaggregatedComputeGroupsController recordComputeGroupIds backend tag get compute_group_name failed, tag: %s, err: no compute_group_id field found ", backend.Tag)
644643
}
645644

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

pkg/controller/sub_controller/sub_controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ func (d *SubDefaultController) CheckSharedPVC(ctx context.Context, dcr *dorisv1.
290290
for _, claim := range dcr.Spec.SharedPersistentVolumeClaims {
291291
pvc, err := k8s.GetPVC(ctx, d.K8sclient, claim.PersistentVolumeClaimName, dcr.Namespace)
292292
if err != nil || pvc == nil {
293-
errMessage := fmt.Sprintf("(PersistentVolumeClaim get failed name: %s, namespace: %s, err: %s), ", claim.PersistentVolumeClaimName, dcr.Namespace, err.Error())
293+
errMessage := fmt.Sprintf("(PersistentVolumeClaim get failed name: %s, namespace: %s, err: %#v), ", claim.PersistentVolumeClaimName, dcr.Namespace, err)
294294
klog.Errorf(errMessage)
295295
d.K8srecorder.Event(dcr, string(EventWarning), string(CheckSharePVC), errMessage)
296296
return
@@ -555,7 +555,7 @@ func (d *SubDefaultController) listAndDeletePersistentVolumeClaim(ctx context.Co
555555

556556
dorisPersistentVolumes, err := d.GetFinalPersistentVolumes(ctx, dcr, componentType)
557557
if err != nil {
558-
d.K8srecorder.Event(dcr, string(EventWarning), PVCExplainFailed, fmt.Sprintf("listAndDeletePersistentVolumeClaim %s GetFinalPersistentVolumes failed%s", componentType, err.Error()))
558+
d.K8srecorder.Event(dcr, string(EventWarning), PVCExplainFailed, fmt.Sprintf("listAndDeletePersistentVolumeClaim %s GetFinalPersistentVolumes failed: %s", componentType, err.Error()))
559559
return err
560560
}
561561

0 commit comments

Comments
 (0)