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 #6936 from xiang90/put_rate

Browse Source 
banchmark: add rate limit
This commit is contained in:
Xiang Li 2016-12-05 12:01:15 -08:00 committed by GitHub
commit 2b6ad93036
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,7 @@ package cmd
import ( import (
"encoding/binary" "encoding/binary"
"fmt" "fmt"
"math"
"math/rand" "math/rand"
"os" "os"
"time" "time"
@ -26,6 +27,7 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"golang.org/x/net/context" "golang.org/x/net/context"
"golang.org/x/time/rate"
"gopkg.in/cheggaaa/pb.v1" "gopkg.in/cheggaaa/pb.v1"
) )
@ -42,6 +44,7 @@ var (
valSize int valSize int
putTotal int putTotal int
putRate int
keySpaceSize int keySpaceSize int
seqKeys bool seqKeys bool
@ -54,6 +57,8 @@ func init() {
RootCmd.AddCommand(putCmd) RootCmd.AddCommand(putCmd)
putCmd.Flags().IntVar(&keySize, "key-size", 8, "Key size of put request") putCmd.Flags().IntVar(&keySize, "key-size", 8, "Key size of put request")
putCmd.Flags().IntVar(&valSize, "val-size", 8, "Value size of put request") putCmd.Flags().IntVar(&valSize, "val-size", 8, "Value size of put request")
putCmd.Flags().IntVar(&putRate, "rate", 0, "Maximum puts per second (0 is no limit)")
putCmd.Flags().IntVar(&putTotal, "total", 10000, "Total number of put requests") putCmd.Flags().IntVar(&putTotal, "total", 10000, "Total number of put requests")
putCmd.Flags().IntVar(&keySpaceSize, "key-space-size", 1, "Maximum possible keys") putCmd.Flags().IntVar(&keySpaceSize, "key-space-size", 1, "Maximum possible keys")
putCmd.Flags().BoolVar(&seqKeys, "sequential-keys", false, "Use sequential keys") putCmd.Flags().BoolVar(&seqKeys, "sequential-keys", false, "Use sequential keys")
@ -68,6 +73,10 @@ func putFunc(cmd *cobra.Command, args []string) {
} }
requests := make(chan v3.Op, totalClients) requests := make(chan v3.Op, totalClients)
if putRate == 0 {
putRate = math.MaxInt32
}
limit := rate.NewLimiter(rate.Limit(putRate), 1)
clients := mustCreateClients(totalClients, totalConns) clients := mustCreateClients(totalClients, totalConns)
k, v := make([]byte, keySize), string(mustRandBytes(valSize)) k, v := make([]byte, keySize), string(mustRandBytes(valSize))
@ -81,6 +90,8 @@ func putFunc(cmd *cobra.Command, args []string) {
go func(c *v3.Client) { go func(c *v3.Client) {
defer wg.Done() defer wg.Done()
for op := range requests { for op := range requests {
limit.Wait(context.Background())
st := time.Now() st := time.Now()
_, err := c.Do(context.Background(), op) _, err := c.Do(context.Background(), op)
r.Results() <- report.Result{Err: err, Start: st, End: time.Now()} r.Results() <- report.Result{Err: err, Start: st, End: time.Now()}