Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13727 from ahrtr/3.5_print_raft_term_in_decimal

Browse Source 
[3.5] Always print raft term in decimal when displaying member list in json
This commit is contained in:
Piotr Tabor
2022-02-25 08:59:52 +01:00
committed by GitHub
parent 1eb8b6a75c 7345d4211b
commit 3c2ef71358
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
etcdctl/ctlv3/command/printer_json.go
View File

@@ -67,7 +67,7 @@ func printMemberListWithHexJSON(r clientv3.MemberListResponse) {
b = strconv.AppendUint(nil, r.Header.MemberId, 16) b = strconv.AppendUint(nil, r.Header.MemberId, 16)
buffer.Write(b) buffer.Write(b)
buffer.WriteString("\",\"raft_term\":") buffer.WriteString("\",\"raft_term\":")
b = strconv.AppendUint(nil, r.Header.RaftTerm, 16) b = strconv.AppendUint(nil, r.Header.RaftTerm, 10)
buffer.Write(b) buffer.Write(b)
buffer.WriteByte('}') buffer.WriteByte('}')
for i := 0; i < len(r.Members); i++ { for i := 0; i < len(r.Members); i++ {

11
tests/e2e/ctl_v3_member_test.go
View File

@@ -155,15 +155,20 @@ func memberListWithHexTest(cx ctlCtx) {
if num == 0 { if num == 0 {
cx.t.Fatal("member number is 0") cx.t.Fatal("member number is 0")
} }
if resp.Header.RaftTerm != hexResp.Header.RaftTerm {
cx.t.Fatalf("Unexpected raft_term, expected %d, got %d", resp.Header.RaftTerm, hexResp.Header.RaftTerm)
}
for i := 0; i < num; i++ { for i := 0; i < num; i++ {
if resp.Members[i].Name != hexResp.Members[i].Name { if resp.Members[i].Name != hexResp.Members[i].Name {
cx.t.Fatalf("member name,expected %v,got %v", resp.Members[i].Name, hexResp.Members[i].Name) cx.t.Fatalf("Unexpected member name,expected %v, got %v", resp.Members[i].Name, hexResp.Members[i].Name)
} }
if !reflect.DeepEqual(resp.Members[i].PeerURLs, hexResp.Members[i].PeerURLs) { if !reflect.DeepEqual(resp.Members[i].PeerURLs, hexResp.Members[i].PeerURLs) {
cx.t.Fatalf("member peerURLs,expected %v,got %v", resp.Members[i].PeerURLs, hexResp.Members[i].PeerURLs) cx.t.Fatalf("Unexpected member peerURLs, expected %v, got %v", resp.Members[i].PeerURLs, hexResp.Members[i].PeerURLs)
} }
if !reflect.DeepEqual(resp.Members[i].ClientURLs, hexResp.Members[i].ClientURLs) { if !reflect.DeepEqual(resp.Members[i].ClientURLs, hexResp.Members[i].ClientURLs) {
cx.t.Fatalf("member clientURLS,expected %v,got %v", resp.Members[i].ClientURLs, hexResp.Members[i].ClientURLs) cx.t.Fatalf("Unexpected member clientURLS, expected %v, got %v", resp.Members[i].ClientURLs, hexResp.Members[i].ClientURLs)
} }
} }
} }