Merge pull request #7715 from gyuho/fmt

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

2
test
View File

@ -27,7 +27,7 @@ fi
COVER=${COVER:-"-cover"}
# 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)"
# all github.com/coreos/etcd/whatever pkgs that are not auto-generated / tools

View File

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

View File

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