etcd-io
/
dbtester
mirror of https://github.com/etcd-io/dbtester.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

new results

This commit is contained in:
Gyu-Ho Lee 2016-05-10 07:44:46 -07:00
parent 0737bc1f5f
commit a6c5d402bf
4 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -19,8 +19,8 @@ We keep full logs here and cloud storage(when it's over 1MB):
Test results:
- https://github.com/coreos/dbtester/tree/master/bench-results/2016051001/README.md
- https://github.com/coreos/dbtester/tree/master/bench-results/2016050901/README.md
- Compression experiment: https://github.com/coreos/dbtester/tree/master/bench-results/2016051001/README.md
- Compression experiment: https://github.com/coreos/dbtester/tree/master/bench-results/2016050901/README.md
- https://github.com/coreos/dbtester/tree/master/bench-results/2016050504/README.md
- https://github.com/coreos/dbtester/tree/master/bench-results/2016050503/README.md
- https://github.com/coreos/dbtester/tree/master/bench-results/2016050502/README.md
@ -42,4 +42,3 @@ Test results:
[cistat]: https://travis-ci.org/coreos/dbtester
[dbtester-godoc]: https://godoc.org/github.com/coreos/dbtester

16
agent/agent.go
View File

@ -29,8 +29,6 @@ import (
log "github.com/Sirupsen/logrus"
"github.com/coreos/dbtester/remotestorage"
"github.com/coreos/etcd/pkg/compress"
// "github.com/coreos/etcd/pkg/compress"
"github.com/gyuho/psn/ps"
"github.com/spf13/cobra"
"golang.org/x/net/context"
@ -245,13 +243,13 @@ func (t *transporterServer) Transfer(ctx context.Context, r *Request) (*Response
"--initial-cluster", clusterStr,
"--initial-cluster-state", "new",
}
if t.req.EtcdCompression != "" {
if compress.ParseType(t.req.EtcdCompression) != compress.NoCompress {
flags = append(flags,
"--experimental-compression", t.req.EtcdCompression,
)
}
}
// if t.req.EtcdCompression != "" {
// if compress.ParseType(t.req.EtcdCompression) != compress.NoCompress {
// flags = append(flags,
// "--experimental-compression", t.req.EtcdCompression,
// )
// }
// }
flagString := strings.Join(flags, " ")
cmd := exec.Command(etcdBinaryPath, flags...)

14
control/control.go
View File

@ -145,7 +145,7 @@ func step1(cfg Config) error {
req.ZookeeperMaxClientCnxns = cfg.Step1.ZookeeperMaxClientCnxns
req.ZookeeperSnapCount = cfg.Step1.ZookeeperSnapCount
req.EtcdCompression = cfg.EtcdCompression
// req.EtcdCompression = cfg.EtcdCompression
donec, errc := make(chan struct{}), make(chan error)
for i := range cfg.PeerIPs {
@ -248,8 +248,8 @@ func step2(cfg Config) error {
}
case "etcdv3":
etcdClients = mustCreateClientsEtcdv3(cfg.DatabaseEndpoints, cfg.Step2.Clients, cfg.Step2.Connections, cfg.EtcdCompression)
// etcdClients = mustCreateClientsEtcdv3(cfg.DatabaseEndpoints, cfg.Step2.Clients, cfg.Step2.Connections)
// etcdClients = mustCreateClientsEtcdv3(cfg.DatabaseEndpoints, cfg.Step2.Clients, cfg.Step2.Connections, cfg.EtcdCompression)
etcdClients = mustCreateClientsEtcdv3(cfg.DatabaseEndpoints, cfg.Step2.Clients, cfg.Step2.Connections)
for i := range etcdClients {
wg.Add(1)
go doPutEtcdv3(context.Background(), etcdClients[i], requests)
@ -412,8 +412,8 @@ func step2(cfg Config) error {
log.Printf("PUT '%s' to etcd", key)
var err error
for i := 0; i < 7; i++ {
clients := mustCreateClientsEtcdv3(cfg.DatabaseEndpoints, 1, 1, cfg.EtcdCompression)
// clients := mustCreateClientsEtcdv3(cfg.DatabaseEndpoints, 1, 1)
// clients := mustCreateClientsEtcdv3(cfg.DatabaseEndpoints, 1, 1, cfg.EtcdCompression)
clients := mustCreateClientsEtcdv3(cfg.DatabaseEndpoints, 1, 1)
_, err = clients[0].Do(context.Background(), clientv3.OpPut(key, value))
if err != nil {
continue
@ -480,8 +480,8 @@ func step2(cfg Config) error {
}
case "etcdv3":
clients := mustCreateClientsEtcdv3(cfg.DatabaseEndpoints, cfg.Step2.Clients, cfg.Step2.Connections, cfg.EtcdCompression)
// clients := mustCreateClientsEtcdv3(cfg.DatabaseEndpoints, cfg.Step2.Clients, cfg.Step2.Connections)
// clients := mustCreateClientsEtcdv3(cfg.DatabaseEndpoints, cfg.Step2.Clients, cfg.Step2.Connections, cfg.EtcdCompression)
clients := mustCreateClientsEtcdv3(cfg.DatabaseEndpoints, cfg.Step2.Clients, cfg.Step2.Connections)
for i := range clients {
wg.Add(1)
go doRangeEtcdv3(clients[i].KV, requests)

17
control/util.go
View File

@ -36,7 +36,6 @@ import (
clientv2 "github.com/coreos/etcd/client"
"github.com/coreos/etcd/clientv3"
"github.com/coreos/etcd/pkg/compress"
"github.com/dustin/go-humanize"
consulapi "github.com/hashicorp/consul/api"
"github.com/samuel/go-zookeeper/zk"
@ -75,13 +74,13 @@ var (
dialTotal int
)
func mustCreateConnEtcdv3(endpoints []string, compressType compress.Type) *clientv3.Client {
// func mustCreateConnEtcdv3(endpoints []string) *clientv3.Client {
// func mustCreateConnEtcdv3(endpoints []string, compressType compress.Type) *clientv3.Client {
func mustCreateConnEtcdv3(endpoints []string) *clientv3.Client {
endpoint := endpoints[dialTotal%len(endpoints)]
dialTotal++
cfg := clientv3.Config{
Endpoints: []string{endpoint},
CompressType: compressType,
Endpoints: []string{endpoint},
// CompressType: compressType,
}
client, err := clientv3.New(cfg)
if err != nil {
@ -91,12 +90,12 @@ func mustCreateConnEtcdv3(endpoints []string, compressType compress.Type) *clien
return client
}
func mustCreateClientsEtcdv3(endpoints []string, totalClients, totalConns int, compressionTypeTxt string) []*clientv3.Client {
// func mustCreateClientsEtcdv3(endpoints []string, totalClients, totalConns int) []*clientv3.Client {
// func mustCreateClientsEtcdv3(endpoints []string, totalClients, totalConns int, compressionTypeTxt string) []*clientv3.Client {
func mustCreateClientsEtcdv3(endpoints []string, totalClients, totalConns int) []*clientv3.Client {
conns := make([]*clientv3.Client, totalConns)
for i := range conns {
conns[i] = mustCreateConnEtcdv3(endpoints, compress.ParseType(compressionTypeTxt))
// conns[i] = mustCreateConnEtcdv3(endpoints)
// conns[i] = mustCreateConnEtcdv3(endpoints, compress.ParseType(compressionTypeTxt))
conns[i] = mustCreateConnEtcdv3(endpoints)
}
clients := make([]*clientv3.Client, totalClients)