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

Merge pull request #324 from gyuho/a 

agent: fix jvm flag order
This commit is contained in:
Gyu-Ho Lee 2017-03-15 16:27:15 -07:00 committed by GitHub
parent 872e86c327 dd1732f5b6
commit 243ad1999f
1 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
agent/agent_zookeeper.go
View File

@ -167,41 +167,39 @@ func startZookeeper(fs *flags, t *transporterServer) error {
return err return err
} }
args := []string{shell}
var flagString string var flagString string
switch t.req.DatabaseID { switch t.req.DatabaseID {
case dbtesterpb.DatabaseID_zookeeper__r3_4_9: case dbtesterpb.DatabaseID_zookeeper__r3_4_9:
flagString = JavaClassPathZookeeperr349 if t.req.Flag_Zookeeper_R3_4_9.JavaDJuteMaxBuffer != 0 {
flagString += fmt.Sprintf(" -Djute.maxbuffer=%d", t.req.Flag_Zookeeper_R3_4_9.JavaDJuteMaxBuffer)
}
if t.req.Flag_Zookeeper_R3_4_9.JavaDJuteMaxBuffer != 0 {
flagString += fmt.Sprintf(" -Xms%s", t.req.Flag_Zookeeper_R3_4_9.JavaXms)
}
if t.req.Flag_Zookeeper_R3_4_9.JavaDJuteMaxBuffer != 0 {
flagString += fmt.Sprintf(" -Xmx%s", t.req.Flag_Zookeeper_R3_4_9.JavaXmx)
}
// -Djute.maxbuffer=33554432 -Xms50G -Xmx50G // -Djute.maxbuffer=33554432 -Xms50G -Xmx50G
if t.req.Flag_Zookeeper_R3_4_9.JavaDJuteMaxBuffer != 0 { flagString += JavaClassPathZookeeperr349
args = append(args, fmt.Sprintf("-Djute.maxbuffer=%d", t.req.Flag_Zookeeper_R3_4_9.JavaDJuteMaxBuffer))
}
if t.req.Flag_Zookeeper_R3_4_9.JavaDJuteMaxBuffer != 0 {
args = append(args, fmt.Sprintf("-Xms%s", t.req.Flag_Zookeeper_R3_4_9.JavaXms))
}
if t.req.Flag_Zookeeper_R3_4_9.JavaDJuteMaxBuffer != 0 {
args = append(args, fmt.Sprintf("-Xmx%s", t.req.Flag_Zookeeper_R3_4_9.JavaXmx))
}
case dbtesterpb.DatabaseID_zookeeper__r3_5_2_alpha: case dbtesterpb.DatabaseID_zookeeper__r3_5_2_alpha:
flagString = JavaClassPathZookeeperr352alpha if t.req.Flag_Zookeeper_R3_5_2Alpha.JavaDJuteMaxBuffer != 0 {
flagString += fmt.Sprintf(" -Djute.maxbuffer=%d", t.req.Flag_Zookeeper_R3_5_2Alpha.JavaDJuteMaxBuffer)
}
if t.req.Flag_Zookeeper_R3_5_2Alpha.JavaDJuteMaxBuffer != 0 {
flagString += fmt.Sprintf(" -Xms%s", t.req.Flag_Zookeeper_R3_5_2Alpha.JavaXms)
}
if t.req.Flag_Zookeeper_R3_5_2Alpha.JavaDJuteMaxBuffer != 0 {
flagString += fmt.Sprintf(" -Xmx%s", t.req.Flag_Zookeeper_R3_5_2Alpha.JavaXmx)
}
// -Djute.maxbuffer=33554432 -Xms50G -Xmx50G // -Djute.maxbuffer=33554432 -Xms50G -Xmx50G
if t.req.Flag_Zookeeper_R3_5_2Alpha.JavaDJuteMaxBuffer != 0 { flagString += JavaClassPathZookeeperr352alpha
args = append(args, fmt.Sprintf("-Djute.maxbuffer=%d", t.req.Flag_Zookeeper_R3_5_2Alpha.JavaDJuteMaxBuffer))
}
if t.req.Flag_Zookeeper_R3_5_2Alpha.JavaDJuteMaxBuffer != 0 {
args = append(args, fmt.Sprintf("-Xms%s", t.req.Flag_Zookeeper_R3_5_2Alpha.JavaXms))
}
if t.req.Flag_Zookeeper_R3_5_2Alpha.JavaDJuteMaxBuffer != 0 {
args = append(args, fmt.Sprintf("-Xmx%s", t.req.Flag_Zookeeper_R3_5_2Alpha.JavaXmx))
}
default: default:
return fmt.Errorf("database ID %q is not supported", t.req.DatabaseID) return fmt.Errorf("database ID %q is not supported", t.req.DatabaseID)
} }
args = append(args, "-c", fs.javaExec+" "+flagString+" "+fs.zkConfig) args := []string{shell, "-c", fs.javaExec + " " + flagString + " " + fs.zkConfig}
cmd := exec.Command(args[0], args[1:]...) cmd := exec.Command(args[0], args[1:]...)
cmd.Stdout = t.databaseLogFile cmd.Stdout = t.databaseLogFile
cmd.Stderr = t.databaseLogFile cmd.Stderr = t.databaseLogFile