Skip to content

Commit df1e2fc

Browse files
committed
errs: improve ErrInvalidGroup message to include specific context
Signed-off-by: okjiang <819421878@qq.com>
1 parent 64be26e commit df1e2fc

2 files changed

Lines changed: 4 additions & 6 deletions

File tree

pkg/errs/errno.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ var (
539539
ErrKeyspaceNotExistsByName = errors.Normalize("keyspace not found with name: %s", errors.RFCCodeText("PD:resourcemanager:ErrKeyspaceNotExistsByName"))
540540
ErrResourceGroupNotExists = errors.Normalize("the %s resource group does not exist", errors.RFCCodeText("PD:resourcemanager:ErrGroupNotExists"))
541541
ErrDeleteReservedGroup = errors.Normalize("cannot delete reserved group", errors.RFCCodeText("PD:resourcemanager:ErrDeleteReservedGroup"))
542-
ErrInvalidGroup = errors.Normalize("invalid group settings, please check the group name, priority and the number of resources", errors.RFCCodeText("PD:resourcemanager:ErrInvalidGroup"))
542+
ErrInvalidGroup = errors.Normalize("invalid group settings, please check %s", errors.RFCCodeText("PD:resourcemanager:ErrInvalidGroup"))
543543
)
544544

545545
// Microservice errors

pkg/mcs/resourcemanager/server/keyspace_manager.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,6 @@ func (krgm *keyspaceResourceGroupManager) parseResourceGroupFromRaw(name, rawVal
108108
err := errors.Errorf("resource group key name %s does not match payload name %s", name, group.Name)
109109
log.Error("resource group name mismatch in storage payload",
110110
zap.Uint32("keyspace-id", krgm.keyspaceID),
111-
zap.String("name", name),
112-
zap.String("payload-name", group.Name),
113111
zap.String("raw-value", rawValue),
114112
zap.Error(err))
115113
return nil, err
@@ -119,10 +117,10 @@ func (krgm *keyspaceResourceGroupManager) parseResourceGroupFromRaw(name, rawVal
119117

120118
func validateResourceGroupProto(grouppb *rmpb.ResourceGroup) error {
121119
if len(grouppb.Name) == 0 || len(grouppb.Name) > maxGroupNameLength {
122-
return errs.ErrInvalidGroup
120+
return errs.ErrInvalidGroup.FastGenByArgs("the group name")
123121
}
124122
if grouppb.GetPriority() > maxPriority {
125-
return errs.ErrInvalidGroup
123+
return errs.ErrInvalidGroup.FastGenByArgs("the group priority")
126124
}
127125
return nil
128126
}
@@ -275,7 +273,7 @@ func (krgm *keyspaceResourceGroupManager) addResourceGroup(grouppb *rmpb.Resourc
275273

276274
func (krgm *keyspaceResourceGroupManager) modifyResourceGroup(group *rmpb.ResourceGroup) error {
277275
if group == nil || group.Name == "" {
278-
return errs.ErrInvalidGroup
276+
return errs.ErrInvalidGroup.FastGenByArgs("the group name")
279277
}
280278
krgm.RLock()
281279
curGroup, ok := krgm.groups[group.Name]

0 commit comments

Comments
 (0)