diff --git a/agent/agent_etcd.go b/agent/agent_etcd.go index cd165e06..148234f9 100644 --- a/agent/agent_etcd.go +++ b/agent/agent_etcd.go @@ -48,6 +48,26 @@ func startEtcd(fs *flags, t *transporterServer) error { var flags []string switch t.req.DatabaseID { + case dbtesterpb.DatabaseID_etcd__other: + flags = []string{ + "--name", names[t.req.IPIndex], + "--data-dir", fs.etcdDataDir, + "--quota-backend-bytes", fmt.Sprintf("%d", t.req.Flag_Etcd_Other.QuotaSizeBytes), + + "--snapshot-count", fmt.Sprintf("%d", t.req.Flag_Etcd_Other.SnapshotCount), + + "--listen-client-urls", clientURLs[t.req.IPIndex], + "--advertise-client-urls", clientURLs[t.req.IPIndex], + + "--listen-peer-urls", peerURLs[t.req.IPIndex], + "--initial-advertise-peer-urls", peerURLs[t.req.IPIndex], + + "--initial-cluster-token", "mytoken", + "--initial-cluster", strings.Join(members, ","), + "--initial-cluster-state", "new", + "--logger", "zap", + } + case dbtesterpb.DatabaseID_etcd__tip: flags = []string{ "--name", names[t.req.IPIndex], diff --git a/agent/server.go b/agent/server.go index 2301e56c..a9c109ce 100644 --- a/agent/server.go +++ b/agent/server.go @@ -100,7 +100,8 @@ func (t *transporterServer) Transfer(ctx context.Context, req *dbtesterpb.Reques plog.Infof("system metrics CSV path: %q", globalFlags.systemMetricsCSV) switch req.DatabaseID { - case dbtesterpb.DatabaseID_etcd__tip, + case dbtesterpb.DatabaseID_etcd__other, + dbtesterpb.DatabaseID_etcd__tip, dbtesterpb.DatabaseID_etcd__v3_2, dbtesterpb.DatabaseID_etcd__v3_3: plog.Infof("etcd executable binary path: %q", globalFlags.etcdExec) @@ -136,7 +137,8 @@ func (t *transporterServer) Transfer(ctx context.Context, req *dbtesterpb.Reques switch req.Operation { case dbtesterpb.Operation_Start: switch t.req.DatabaseID { - case dbtesterpb.DatabaseID_etcd__tip, + case dbtesterpb.DatabaseID_etcd__other, + dbtesterpb.DatabaseID_etcd__tip, dbtesterpb.DatabaseID_etcd__v3_2, dbtesterpb.DatabaseID_etcd__v3_3, dbtesterpb.DatabaseID_zetcd__beta, @@ -281,7 +283,8 @@ func (t *transporterServer) Transfer(ctx context.Context, req *dbtesterpb.Reques func measureDatabasSize(flg flags, rdb dbtesterpb.DatabaseID) (int64, error) { switch rdb { - case dbtesterpb.DatabaseID_etcd__tip, + case dbtesterpb.DatabaseID_etcd__other, + dbtesterpb.DatabaseID_etcd__tip, dbtesterpb.DatabaseID_etcd__v3_2, dbtesterpb.DatabaseID_etcd__v3_3, dbtesterpb.DatabaseID_cetcd__beta,