Merge pull request apache#440 from ztonny/master

[Bug] fix issue apache#439

Author: catpineapple

pkg/common/utils/mysql/mysql.go

@@ -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])

pkg/common/utils/resource/configmap_test.go

@@ -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) {
@@ -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))
 	}
 }
 

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

@@ -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 {
@@ -641,8 +641,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]

pkg/controller/sub_controller/sub_controller.go

@@ -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
@@ -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
 	}