github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #117919 from dlipovetsky/kubeadm-etcd-log-message-format

Browse Source 
kubeadm: Remove leading zeros from etcd member ID in log messages
This commit is contained in:
Kubernetes Prow Robot 2023-05-14 20:09:38 -07:00 committed by GitHub
commit f70c26d495
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
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)
@ -410,7 +410,7 @@ func (c *Client) addMember(name string, peerAddrs string, isLearner bool) ([]Mem
if isLearner { if isLearner {
// if learnerID is set, it means the etcd member is already added successfully. // if learnerID is set, it means the etcd member is already added successfully.
if learnerID == 0 { if learnerID == 0 {
klog.V(1).Infof("[etcd] Adding etcd member as learner: %016x", peerAddrs) klog.V(1).Info("[etcd] Adding etcd member as learner")
resp, err = cli.MemberAddAsLearner(ctx, []string{peerAddrs}) resp, err = cli.MemberAddAsLearner(ctx, []string{peerAddrs})
if err != nil { if err != nil {
lastError = err lastError = 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
}) })