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

dbtester: add TODOs

This commit is contained in:
Gyu-Ho Lee 2017-02-23 08:06:15 -08:00
parent adaed6d723
commit 0e1efe7445
No known key found for this signature in database
GPG Key ID: 1DDD39C7EB70C24C
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
config_dbtester.go
View File

@ -44,7 +44,7 @@ type Config struct {
AllDatabaseIDList []string `yaml:"all_database_id_list"` AllDatabaseIDList []string `yaml:"all_database_id_list"`
DatabaseIDToConfigClientMachineAgentControl map[string]dbtesterpb.ConfigClientMachineAgentControl `yaml:"datatbase_id_to_config_client_machine_agent_control"` DatabaseIDToConfigClientMachineAgentControl map[string]dbtesterpb.ConfigClientMachineAgentControl `yaml:"datatbase_id_to_config_client_machine_agent_control"`
DatabaseIDToConfigAnalyzeMachineInitial map[string]dbtesterpb.ConfigAnalyzeMachineInitial `yaml:"datatbase_id_to_config_analyze_machine_common"` DatabaseIDToConfigAnalyzeMachineInitial map[string]dbtesterpb.ConfigAnalyzeMachineInitial `yaml:"datatbase_id_to_config_analyze_machine_common"`
dbtesterpb.ConfigAnalyzeMachineAllAggregatedOutput `yaml:"analyze_all_aggregated_output"` dbtesterpb.ConfigAnalyzeMachineAllAggregatedOutput `yaml:"analyze_all_aggregated_output"`
@ -66,7 +66,7 @@ func ReadConfig(fpath string, analyze bool) (*Config, error) {
for _, id := range cfg.AllDatabaseIDList { for _, id := range cfg.AllDatabaseIDList {
if !dbtesterpb.IsValidDatabaseID(id) { if !dbtesterpb.IsValidDatabaseID(id) {
return nil, fmt.Errorf("%q is unknown", id) return nil, fmt.Errorf("databaseID %q is unknown", id)
} }
} }
@ -83,6 +83,10 @@ func ReadConfig(fpath string, analyze bool) (*Config, error) {
} }
for databaseID, group := range cfg.DatabaseIDToConfigClientMachineAgentControl { for databaseID, group := range cfg.DatabaseIDToConfigClientMachineAgentControl {
if !dbtesterpb.IsValidDatabaseID(databaseID) {
return nil, fmt.Errorf("databaseID %q is unknown", databaseID)
}
group.DatabaseID = databaseID group.DatabaseID = databaseID
group.DatabaseTag = MakeTag(group.DatabaseDescription) group.DatabaseTag = MakeTag(group.DatabaseDescription)
group.PeerIPsString = strings.Join(group.PeerIPs, "___") group.PeerIPsString = strings.Join(group.PeerIPs, "___")
@ -154,6 +158,7 @@ func ReadConfig(fpath string, analyze bool) (*Config, error) {
cfg.DatabaseIDToConfigClientMachineAgentControl[dbtesterpb.DatabaseID_etcd__tip.String()] = v cfg.DatabaseIDToConfigClientMachineAgentControl[dbtesterpb.DatabaseID_etcd__tip.String()] = v
} }
// TODO: add JVM flags
if v, ok := cfg.DatabaseIDToConfigClientMachineAgentControl[dbtesterpb.DatabaseID_zookeeper__r3_4_9.String()]; ok { if v, ok := cfg.DatabaseIDToConfigClientMachineAgentControl[dbtesterpb.DatabaseID_zookeeper__r3_4_9.String()]; ok {
if v.Flag_Zookeeper_R3_4_9.TickTime == 0 { if v.Flag_Zookeeper_R3_4_9.TickTime == 0 {
v.Flag_Zookeeper_R3_4_9.TickTime = defaultZookeeperTickTime v.Flag_Zookeeper_R3_4_9.TickTime = defaultZookeeperTickTime