From 8f3331d4ea67036782dc286845a2e7f7455c0de5 Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Tue, 9 Jan 2018 20:05:51 -0800 Subject: [PATCH] agent: fix etcd agent database ID switch Signed-off-by: Gyuho Lee --- agent/agent_etcd.go | 42 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 39 insertions(+), 3 deletions(-) diff --git a/agent/agent_etcd.go b/agent/agent_etcd.go index 93cb89dc..688df867 100644 --- a/agent/agent_etcd.go +++ b/agent/agent_etcd.go @@ -48,9 +48,7 @@ func startEtcd(fs *flags, t *transporterServer) error { var flags []string switch t.req.DatabaseID { - case dbtesterpb.DatabaseID_etcd__tip, - dbtesterpb.DatabaseID_etcd__v3_2, - dbtesterpb.DatabaseID_etcd__v3_3: + case dbtesterpb.DatabaseID_etcd__tip: flags = []string{ "--name", names[t.req.IPIndex], "--data-dir", fs.etcdDataDir, @@ -69,6 +67,44 @@ func startEtcd(fs *flags, t *transporterServer) error { "--initial-cluster-state", "new", } + case dbtesterpb.DatabaseID_etcd__v3_2: + flags = []string{ + "--name", names[t.req.IPIndex], + "--data-dir", fs.etcdDataDir, + "--quota-backend-bytes", fmt.Sprintf("%d", t.req.Flag_Etcd_V3_2.QuotaSizeBytes), + + "--snapshot-count", fmt.Sprintf("%d", t.req.Flag_Etcd_V3_2.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", + } + + case dbtesterpb.DatabaseID_etcd__v3_3: + flags = []string{ + "--name", names[t.req.IPIndex], + "--data-dir", fs.etcdDataDir, + "--quota-backend-bytes", fmt.Sprintf("%d", t.req.Flag_Etcd_V3_3.QuotaSizeBytes), + + "--snapshot-count", fmt.Sprintf("%d", t.req.Flag_Etcd_V3_3.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", + } + default: return fmt.Errorf("database ID %q is not supported", t.req.DatabaseID) }