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 #7715 from gyuho/fmt

Browse Source 
tools/benchmark: fix misc gofmt warnings
This commit is contained in:
Gyu-Ho Lee 2017-04-12 14:27:37 -07:00 committed by GitHub
commit 2046d66927
3 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test
View File

@ -27,7 +27,7 @@ fi
COVER=${COVER:-"-cover"} COVER=${COVER:-"-cover"}
# Hack: gofmt ./ will recursively check the .git directory. So use *.go for gofmt. # Hack: gofmt ./ will recursively check the .git directory. So use *.go for gofmt.
IGNORE_PKGS="(cmd|vendor|etcdserverpb|rafttest|gopath.proto|v3lockpb|v3electionpb)" IGNORE_PKGS="(cmd/|etcdserverpb|rafttest|gopath.proto|v3lockpb|v3electionpb)"
INTEGRATION_PKGS="(integration|e2e|contrib|functional-tester)" INTEGRATION_PKGS="(integration|e2e|contrib|functional-tester)"
# all github.com/coreos/etcd/whatever pkgs that are not auto-generated / tools # all github.com/coreos/etcd/whatever pkgs that are not auto-generated / tools

2
tools/benchmark/cmd/lease.go
View File

@ -59,7 +59,7 @@ func leaseKeepaliveFunc(cmd *cobra.Command, args []string) {
if err != nil { if err != nil {
panic(err) panic(err)
} }
for _ = range requests { for range requests {
st := time.Now() st := time.Now()
_, err := c.KeepAliveOnce(context.TODO(), resp.ID) _, err := c.KeepAliveOnce(context.TODO(), resp.ID)
r.Results() <- report.Result{Err: err, Start: st, End: time.Now()} r.Results() <- report.Result{Err: err, Start: st, End: time.Now()}

30
tools/benchmark/cmd/put.go
View File

@ -129,26 +129,18 @@ func putFunc(cmd *cobra.Command, args []string) {
} }
func compactKV(clients []*v3.Client) { func compactKV(clients []*v3.Client) {
var curRev int64 ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
for _, c := range clients { resp, err := clients[0].KV.Get(ctx, "foo")
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) cancel()
resp, err := c.KV.Get(ctx, "foo") if err != nil {
cancel() panic(err)
if err != nil {
panic(err)
}
curRev = resp.Header.Revision
break
} }
revToCompact := max(0, curRev-compactIndexDelta) revToCompact := max(0, resp.Header.Revision-compactIndexDelta)
for _, c := range clients { ctx, cancel = context.WithTimeout(context.Background(), 5*time.Second)
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) _, err = clients[0].KV.Compact(ctx, revToCompact)
_, err := c.KV.Compact(ctx, revToCompact) cancel()
cancel() if err != nil {
if err != nil { panic(err)
panic(err)
}
break
} }
} }