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

agent: set 'cetcd', 'zetcd' flags per releases

This commit is contained in:
Gyu-Ho Lee 2017-02-23 10:22:40 -08:00
parent 687bdb3c81
commit 17a972b474
No known key found for this signature in database
GPG Key ID: 1DDD39C7EB70C24C
2 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
agent/agent_cetcd.go
View File

@ -18,6 +18,8 @@ import (
"fmt" "fmt"
"os/exec" "os/exec"
"strings" "strings"
"github.com/coreos/dbtester/dbtesterpb"
) )
// startCetcd starts cetcd. This assumes that etcd is already started. // startCetcd starts cetcd. This assumes that etcd is already started.
@ -32,11 +34,19 @@ func startCetcd(fs *flags, t *transporterServer) error {
clientURLs[i] = fmt.Sprintf("http://%s:2379", u) clientURLs[i] = fmt.Sprintf("http://%s:2379", u)
} }
flags := []string{ var flags []string
// "-consuladdr", "0.0.0.0:8500", switch t.req.DatabaseID {
"-consuladdr", fmt.Sprintf("%s:8500", peerIPs[t.req.IPIndex]), case dbtesterpb.DatabaseID_cetcd__beta:
"-etcd", clientURLs[t.req.IPIndex], // etcd endpoint flags = []string{
// "-consuladdr", "0.0.0.0:8500",
"-consuladdr", fmt.Sprintf("%s:8500", peerIPs[t.req.IPIndex]),
"-etcd", clientURLs[t.req.IPIndex], // etcd endpoint
}
default:
return fmt.Errorf("database ID %q is not supported", t.req.DatabaseID)
} }
flagString := strings.Join(flags, " ") flagString := strings.Join(flags, " ")
cmd := exec.Command(fs.cetcdExec, flags...) cmd := exec.Command(fs.cetcdExec, flags...)

18
agent/agent_zetcd.go
View File

@ -18,6 +18,8 @@ import (
"fmt" "fmt"
"os/exec" "os/exec"
"strings" "strings"
"github.com/coreos/dbtester/dbtesterpb"
) )
// startZetcd starts zetcd. This assumes that etcd is already started. // startZetcd starts zetcd. This assumes that etcd is already started.
@ -32,11 +34,19 @@ func startZetcd(fs *flags, t *transporterServer) error {
clientURLs[i] = fmt.Sprintf("http://%s:2379", u) clientURLs[i] = fmt.Sprintf("http://%s:2379", u)
} }
flags := []string{ var flags []string
// "-zkaddr", "0.0.0.0:2181", switch t.req.DatabaseID {
"-zkaddr", fmt.Sprintf("%s:2181", peerIPs[t.req.IPIndex]), case dbtesterpb.DatabaseID_zetcd__beta:
"-endpoint", clientURLs[t.req.IPIndex], flags = []string{
// "-zkaddr", "0.0.0.0:2181",
"-zkaddr", fmt.Sprintf("%s:2181", peerIPs[t.req.IPIndex]),
"-endpoint", clientURLs[t.req.IPIndex],
}
default:
return fmt.Errorf("database ID %q is not supported", t.req.DatabaseID)
} }
flagString := strings.Join(flags, " ") flagString := strings.Join(flags, " ")
cmd := exec.Command(fs.zetcdExec, flags...) cmd := exec.Command(fs.zetcdExec, flags...)