mirrors/etcd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

functional-tester: use log-dir as data-dir in etcd-agent

Browse Source 
Persistent data should be configured in agent side.
There is no need to specify the data-dir in tester side.

Signed-off-by: Gyu-Ho Lee <gyuhox@gmail.com>
This commit is contained in:
Gyu-Ho Lee
2017-05-12 08:30:46 -07:00
parent f337754e72
commit 2e3d27e910
3 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tools/functional-tester/etcd-agent/agent.go
View File

@ -75,6 +75,7 @@ func newAgent(cfg AgentConfig) (*Agent, error) {
// start starts a new etcd process with the given args. // start starts a new etcd process with the given args.
func (a *Agent) start(args ...string) error { func (a *Agent) start(args ...string) error {
args = append(args, "--data-dir", a.dataDir())
a.cmd = exec.Command(a.cmd.Path, args...) a.cmd = exec.Command(a.cmd.Path, args...)
a.cmd.Env = []string{"GOFAIL_HTTP=" + a.cfg.FailpointAddr} a.cmd.Env = []string{"GOFAIL_HTTP=" + a.cfg.FailpointAddr}
a.cmd.Stdout = a.logfile a.cmd.Stdout = a.logfile
@ -206,17 +207,7 @@ func (a *Agent) status() client.Status {
} }
func (a *Agent) dataDir() string { func (a *Agent) dataDir() string {
datadir := filepath.Join(a.cfg.LogDir, "*.etcd") return filepath.Join(a.cfg.LogDir, "etcd.data")
args := a.cmd.Args
// only parse the simple case like "--data-dir /var/lib/etcd"
for i, arg := range args {
if arg == "--data-dir" {
// just take the directory name from request
datadir = filepath.Join(a.cfg.LogDir, filepath.Base(args[i+1]))
break
}
}
return datadir
} }
func existDir(fpath string) bool { func existDir(fpath string) bool {

3
tools/functional-tester/etcd-tester/cluster.go
View File

@ -34,8 +34,6 @@ type agentConfig struct {
clientPort int clientPort int
peerPort int peerPort int
failpointPort int failpointPort int
datadir string
} }
type cluster struct { type cluster struct {
@ -78,7 +76,6 @@ func (c *cluster) bootstrap() error {
for i, m := range members { for i, m := range members {
flags := append( flags := append(
m.Flags(), m.Flags(),
"--data-dir", c.agents[i].datadir,
"--initial-cluster-token", token, "--initial-cluster-token", token,
"--initial-cluster", clusterStr, "--initial-cluster", clusterStr,
"--snapshot-count", "10000") "--snapshot-count", "10000")

2
tools/functional-tester/etcd-tester/main.go
View File

@ -43,7 +43,6 @@ func main() {
peerPorts := flag.String("peer-ports", "", "etcd peer port for each agent endpoint") peerPorts := flag.String("peer-ports", "", "etcd peer port for each agent endpoint")
failpointPorts := flag.String("failpoint-ports", "", "etcd failpoint port for each agent endpoint") failpointPorts := flag.String("failpoint-ports", "", "etcd failpoint port for each agent endpoint")
datadir := flag.String("data-dir", "agent.etcd", "etcd data directory location on agent machine.")
stressKeyLargeSize := flag.Uint("stress-key-large-size", 32*1024+1, "the size of each large key written into etcd.") stressKeyLargeSize := flag.Uint("stress-key-large-size", 32*1024+1, "the size of each large key written into etcd.")
stressKeySize := flag.Uint("stress-key-size", 100, "the size of each small key written into etcd.") stressKeySize := flag.Uint("stress-key-size", 100, "the size of each small key written into etcd.")
stressKeySuffixRange := flag.Uint("stress-key-count", 250000, "the count of key range written into etcd.") stressKeySuffixRange := flag.Uint("stress-key-count", 250000, "the count of key range written into etcd.")
@ -69,7 +68,6 @@ func main() {
agents[i].clientPort = cports[i] agents[i].clientPort = cports[i]
agents[i].peerPort = pports[i] agents[i].peerPort = pports[i]
agents[i].failpointPort = fports[i] agents[i].failpointPort = fports[i]
agents[i].datadir = *datadir
} }
c := &cluster{agents: agents} c := &cluster{agents: agents}