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 #14208 from ahrtr/print_lease_hex

Browse Source 
Print clusterID, memberID and leaseID in hexdecimal
This commit is contained in:
Benjamin Wang 2022-08-13 05:31:40 +08:00 committed by GitHub
commit 52f367b1f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 48 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,7 +79,7 @@ func NewPrinter(printerType string, isHex bool) printer {
case "simple":
return &simplePrinter{isHex: isHex}
case "fields":
return &fieldsPrinter{newPrinterUnsupported("fields")}
return &fieldsPrinter{printer: newPrinterUnsupported("fields"), isHex: isHex}
case "json":
return newJSONPrinter(isHex)
case "protobuf":

39
etcdctl/ctlv3/command/printer_fields.go
View File

@ -19,10 +19,14 @@ import (
pb "go.etcd.io/etcd/api/v3/etcdserverpb"
spb "go.etcd.io/etcd/api/v3/mvccpb"
"go.etcd.io/etcd/client/pkg/v3/types"
v3 "go.etcd.io/etcd/client/v3"
)
type fieldsPrinter struct{ printer }
type fieldsPrinter struct {
printer
isHex bool
}
func (p *fieldsPrinter) kv(pfx string, kv *spb.KeyValue) {
fmt.Printf("\"%sKey\" : %q\n", pfx, string(kv.Key))
@ -30,12 +34,21 @@ func (p *fieldsPrinter) kv(pfx string, kv *spb.KeyValue) {
fmt.Printf("\"%sModRevision\" : %d\n", pfx, kv.ModRevision)
fmt.Printf("\"%sVersion\" : %d\n", pfx, kv.Version)
fmt.Printf("\"%sValue\" : %q\n", pfx, string(kv.Value))
if p.isHex {
fmt.Printf("\"%sLease\" : %016x\n", pfx, kv.Lease)
} else {
fmt.Printf("\"%sLease\" : %d\n", pfx, kv.Lease)
}
}
func (p *fieldsPrinter) hdr(h *pb.ResponseHeader) {
if p.isHex {
fmt.Println(`"ClusterID" :`, types.ID(h.ClusterId))
fmt.Println(`"MemberID" :`, types.ID(h.MemberId))
} else {
fmt.Println(`"ClusterID" :`, h.ClusterId)
fmt.Println(`"MemberID" :`, h.MemberId)
}
// Revision only makes sense for k/v responses. For other kinds of
// responses, i.e. MemberList, usually the revision isn't populated
// at all; so it would be better to hide this field in these cases.
@ -99,7 +112,11 @@ func (p *fieldsPrinter) Watch(resp v3.WatchResponse) {
func (p *fieldsPrinter) Grant(r v3.LeaseGrantResponse) {
p.hdr(r.ResponseHeader)
if p.isHex {
fmt.Printf("\"ID\" : %016x\n", r.ID)
} else {
fmt.Println(`"ID" :`, r.ID)
}
fmt.Println(`"TTL" :`, r.TTL)
}
@ -109,13 +126,21 @@ func (p *fieldsPrinter) Revoke(id v3.LeaseID, r v3.LeaseRevokeResponse) {
func (p *fieldsPrinter) KeepAlive(r v3.LeaseKeepAliveResponse) {
p.hdr(r.ResponseHeader)
if p.isHex {
fmt.Printf("\"ID\" : %016x\n", r.ID)
} else {
fmt.Println(`"ID" :`, r.ID)
}
fmt.Println(`"TTL" :`, r.TTL)
}
func (p *fieldsPrinter) TimeToLive(r v3.LeaseTimeToLiveResponse, keys bool) {
p.hdr(r.ResponseHeader)
if p.isHex {
fmt.Printf("\"ID\" : %016x\n", r.ID)
} else {
fmt.Println(`"ID" :`, r.ID)
}
fmt.Println(`"TTL" :`, r.TTL)
fmt.Println(`"GrantedTTL" :`, r.GrantedTTL)
for _, k := range r.Keys {
@ -126,14 +151,22 @@ func (p *fieldsPrinter) TimeToLive(r v3.LeaseTimeToLiveResponse, keys bool) {
func (p *fieldsPrinter) Leases(r v3.LeaseLeasesResponse) {
p.hdr(r.ResponseHeader)
for _, item := range r.Leases {
if p.isHex {
fmt.Printf("\"ID\" : %016x\n", item.ID)
} else {
fmt.Println(`"ID" :`, item.ID)
}
}
}
func (p *fieldsPrinter) MemberList(r v3.MemberListResponse) {
p.hdr(r.Header)
for _, m := range r.Members {
if p.isHex {
fmt.Println(`"ID" :`, types.ID(m.ID))
} else {
fmt.Println(`"ID" :`, m.ID)
}
fmt.Printf("\"Name\" : %q\n", m.Name)
for _, u := range m.PeerURLs {
fmt.Printf("\"PeerURL\" : %q\n", u)
@ -186,7 +219,11 @@ func (p *fieldsPrinter) EndpointHashKV(hs []epHashKV) {
func (p *fieldsPrinter) Alarm(r v3.AlarmResponse) {
p.hdr(r.Header)
for _, a := range r.Alarms {
if p.isHex {
fmt.Println(`"MemberID" :`, types.ID(a.MemberID))
} else {
fmt.Println(`"MemberID" :`, a.MemberID)
}
fmt.Println(`"AlarmType" :`, a.Alarm)
fmt.Println()
}