github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-01 01:08:55 +00:00
Code Issues Projects Releases Wiki Activity

kubeadm: Remove leading zeros from etcd member ID in log messages

Browse Source
This commit is contained in:
Daniel Lipovetsky
2023-05-10 16:06:22 -07:00
parent ff4c6916ec
commit ef9f8d7c0c
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/kubeadm/app/util/etcd/etcd.go
View File

@@ -349,7 +349,7 @@ func (c *Client) RemoveMember(id uint64) ([]Member, error) {
return true, nil return true, nil
} }
if errors.Is(rpctypes.ErrMemberNotFound, err) { if errors.Is(rpctypes.ErrMemberNotFound, err) {
klog.V(5).Infof("Member was already removed, because member %016x was not found", id) klog.V(5).Infof("Member was already removed, because member %s was not found", strconv.FormatUint(id, 16))
return true, nil return true, nil
} }
klog.V(5).Infof("Failed to remove etcd member: %v", err) klog.V(5).Infof("Failed to remove etcd member: %v", err)
@@ -496,11 +496,11 @@ func (c *Client) MemberPromote(learnerID uint64) error {
return err return err
} }
if !isLearner { if !isLearner {
klog.V(1).Infof("[etcd] Member %016x already promoted.", learnerID) klog.V(1).Infof("[etcd] Member %s already promoted.", strconv.FormatUint(learnerID, 16))
return nil return nil
} }
klog.V(1).Infof("[etcd] Promoting a learner as a voting member: %016x", learnerID) klog.V(1).Infof("[etcd] Promoting a learner as a voting member: %s", strconv.FormatUint(learnerID, 16))
cli, err := c.newEtcdClient(c.Endpoints) cli, err := c.newEtcdClient(c.Endpoints)
if err != nil { if err != nil {
return err return err
@@ -522,10 +522,10 @@ func (c *Client) MemberPromote(learnerID uint64) error {
_, err = cli.MemberPromote(ctx, learnerID) _, err = cli.MemberPromote(ctx, learnerID)
if err == nil { if err == nil {
klog.V(1).Infof("[etcd] The learner was promoted as a voting member: %016x", learnerID) klog.V(1).Infof("[etcd] The learner was promoted as a voting member: %s", strconv.FormatUint(learnerID, 16))
return true, nil return true, nil
} }
klog.V(5).Infof("[etcd] Promoting the learner %016x failed: %v", learnerID, err) klog.V(5).Infof("[etcd] Promoting the learner %s failed: %v", strconv.FormatUint(learnerID, 16), err)
lastError = err lastError = err
return false, nil return false, nil
}) })