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

*: drop more old databases 

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
This commit is contained in:
Gyuho Lee 2018-01-09 06:10:00 -08:00
parent d04b7b0019
commit 5afc1335b1
2 changed files with 8 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
config_dbtester.go
View File

@ -148,18 +148,6 @@ func ReadConfig(fpath string, analyze bool) (*Config, error) {
defaultZookeeperMaxClientConnections int64 = 5000 defaultZookeeperMaxClientConnections int64 = 5000
) )
if v, ok := cfg.DatabaseIDToConfigClientMachineAgentControl[dbtesterpb.DatabaseID_etcd__v2_3.String()]; ok {
if v.AgentPortToConnect == 0 {
v.AgentPortToConnect = defaultAgentPort
}
if v.DatabasePortToConnect == 0 {
v.DatabasePortToConnect = defaultEtcdClientPort
}
if v.Flag_Etcd_V2_3.SnapshotCount == 0 {
v.Flag_Etcd_V2_3.SnapshotCount = defaultEtcdSnapshotCount
}
cfg.DatabaseIDToConfigClientMachineAgentControl[dbtesterpb.DatabaseID_etcd__v2_3.String()] = v
}
if v, ok := cfg.DatabaseIDToConfigClientMachineAgentControl[dbtesterpb.DatabaseID_etcd__v3_1.String()]; ok { if v, ok := cfg.DatabaseIDToConfigClientMachineAgentControl[dbtesterpb.DatabaseID_etcd__v3_1.String()]; ok {
if v.AgentPortToConnect == 0 { if v.AgentPortToConnect == 0 {
v.AgentPortToConnect = defaultAgentPort v.AgentPortToConnect = defaultAgentPort
@ -288,24 +276,6 @@ func ReadConfig(fpath string, analyze bool) (*Config, error) {
cfg.DatabaseIDToConfigClientMachineAgentControl[dbtesterpb.DatabaseID_zookeeper__r3_5_3_beta.String()] = v cfg.DatabaseIDToConfigClientMachineAgentControl[dbtesterpb.DatabaseID_zookeeper__r3_5_3_beta.String()] = v
} }
if v, ok := cfg.DatabaseIDToConfigClientMachineAgentControl[dbtesterpb.DatabaseID_consul__v0_7_5.String()]; ok {
if v.AgentPortToConnect == 0 {
v.AgentPortToConnect = defaultAgentPort
}
if v.DatabasePortToConnect == 0 {
v.DatabasePortToConnect = defaultConsulClientPort
}
cfg.DatabaseIDToConfigClientMachineAgentControl[dbtesterpb.DatabaseID_consul__v0_7_5.String()] = v
}
if v, ok := cfg.DatabaseIDToConfigClientMachineAgentControl[dbtesterpb.DatabaseID_consul__v0_8_0.String()]; ok {
if v.AgentPortToConnect == 0 {
v.AgentPortToConnect = defaultAgentPort
}
if v.DatabasePortToConnect == 0 {
v.DatabasePortToConnect = defaultConsulClientPort
}
cfg.DatabaseIDToConfigClientMachineAgentControl[dbtesterpb.DatabaseID_consul__v0_8_0.String()] = v
}
if v, ok := cfg.DatabaseIDToConfigClientMachineAgentControl[dbtesterpb.DatabaseID_consul__v0_8_4.String()]; ok { if v, ok := cfg.DatabaseIDToConfigClientMachineAgentControl[dbtesterpb.DatabaseID_consul__v0_8_4.String()]; ok {
if v.AgentPortToConnect == 0 { if v.AgentPortToConnect == 0 {
v.AgentPortToConnect = defaultAgentPort v.AgentPortToConnect = defaultAgentPort
@ -318,20 +288,18 @@ func ReadConfig(fpath string, analyze bool) (*Config, error) {
// need etcd configs since it's backed by etcd // need etcd configs since it's backed by etcd
if _, ok := cfg.DatabaseIDToConfigClientMachineAgentControl[dbtesterpb.DatabaseID_zetcd__beta.String()]; ok { if _, ok := cfg.DatabaseIDToConfigClientMachineAgentControl[dbtesterpb.DatabaseID_zetcd__beta.String()]; ok {
_, ok1 := cfg.DatabaseIDToConfigClientMachineAgentControl[dbtesterpb.DatabaseID_etcd__v2_3.String()] _, ok31 := cfg.DatabaseIDToConfigClientMachineAgentControl[dbtesterpb.DatabaseID_etcd__v3_1.String()]
_, ok2 := cfg.DatabaseIDToConfigClientMachineAgentControl[dbtesterpb.DatabaseID_etcd__v3_1.String()] _, ok32 := cfg.DatabaseIDToConfigClientMachineAgentControl[dbtesterpb.DatabaseID_etcd__v3_2.String()]
_, ok3 := cfg.DatabaseIDToConfigClientMachineAgentControl[dbtesterpb.DatabaseID_etcd__v3_2.String()] _, okTip := cfg.DatabaseIDToConfigClientMachineAgentControl[dbtesterpb.DatabaseID_etcd__tip.String()]
_, ok4 := cfg.DatabaseIDToConfigClientMachineAgentControl[dbtesterpb.DatabaseID_etcd__tip.String()] if !ok1 && !ok31 && !ok32 && !okTip {
if !ok1 && !ok2 && !ok3 && !ok4 {
return nil, fmt.Errorf("got %q config, but no etcd config is given", dbtesterpb.DatabaseID_zetcd__beta.String()) return nil, fmt.Errorf("got %q config, but no etcd config is given", dbtesterpb.DatabaseID_zetcd__beta.String())
} }
} }
if _, ok := cfg.DatabaseIDToConfigClientMachineAgentControl[dbtesterpb.DatabaseID_cetcd__beta.String()]; ok { if _, ok := cfg.DatabaseIDToConfigClientMachineAgentControl[dbtesterpb.DatabaseID_cetcd__beta.String()]; ok {
_, ok1 := cfg.DatabaseIDToConfigClientMachineAgentControl[dbtesterpb.DatabaseID_etcd__v2_3.String()] _, ok31 := cfg.DatabaseIDToConfigClientMachineAgentControl[dbtesterpb.DatabaseID_etcd__v3_1.String()]
_, ok2 := cfg.DatabaseIDToConfigClientMachineAgentControl[dbtesterpb.DatabaseID_etcd__v3_1.String()] _, ok32 := cfg.DatabaseIDToConfigClientMachineAgentControl[dbtesterpb.DatabaseID_etcd__v3_2.String()]
_, ok3 := cfg.DatabaseIDToConfigClientMachineAgentControl[dbtesterpb.DatabaseID_etcd__v3_2.String()] _, okTip := cfg.DatabaseIDToConfigClientMachineAgentControl[dbtesterpb.DatabaseID_etcd__tip.String()]
_, ok4 := cfg.DatabaseIDToConfigClientMachineAgentControl[dbtesterpb.DatabaseID_etcd__tip.String()] if !ok1 && !ok31 && !ok32 && !okTip {
if !ok1 && !ok2 && !ok3 && !ok4 {
return nil, fmt.Errorf("got %q config, but no etcd config is given", dbtesterpb.DatabaseID_cetcd__beta.String()) return nil, fmt.Errorf("got %q config, but no etcd config is given", dbtesterpb.DatabaseID_cetcd__beta.String())
} }
} }
@ -382,10 +350,6 @@ func (cfg *Config) ToRequest(databaseID string, op dbtesterpb.Operation, idx int
} }
switch req.DatabaseID { switch req.DatabaseID {
case dbtesterpb.DatabaseID_etcd__v2_3:
req.Flag_Etcd_V2_3 = &dbtesterpb.Flag_Etcd_V2_3{
SnapshotCount: gcfg.Flag_Etcd_V2_3.SnapshotCount,
}
case dbtesterpb.DatabaseID_etcd__v3_1: case dbtesterpb.DatabaseID_etcd__v3_1:
if gcfg.Flag_Etcd_V3_1.QuotaSizeBytes > maxEtcdQuotaSize { if gcfg.Flag_Etcd_V3_1.QuotaSizeBytes > maxEtcdQuotaSize {
err = fmt.Errorf("maximum etcd quota is 8 GB (%d), got %d", maxEtcdQuotaSize, gcfg.Flag_Etcd_V3_1.QuotaSizeBytes) err = fmt.Errorf("maximum etcd quota is 8 GB (%d), got %d", maxEtcdQuotaSize, gcfg.Flag_Etcd_V3_1.QuotaSizeBytes)
@ -454,8 +418,6 @@ func (cfg *Config) ToRequest(databaseID string, op dbtesterpb.Operation, idx int
MaxClientConnections: gcfg.Flag_Zookeeper_R3_5_3Beta.MaxClientConnections, MaxClientConnections: gcfg.Flag_Zookeeper_R3_5_3Beta.MaxClientConnections,
} }
case dbtesterpb.DatabaseID_consul__v0_7_5:
case dbtesterpb.DatabaseID_consul__v0_8_0:
case dbtesterpb.DatabaseID_consul__v0_8_4: case dbtesterpb.DatabaseID_consul__v0_8_4:
case dbtesterpb.DatabaseID_zetcd__beta: case dbtesterpb.DatabaseID_zetcd__beta:

18
dbtesterpb/util.go
View File

@ -39,8 +39,6 @@ func GetAllDatabaseIDs() []string {
func GetRGBI(databaseID string, i int) color.Color { func GetRGBI(databaseID string, i int) color.Color {
switch databaseID { switch databaseID {
case "etcd__v2_3":
return color.RGBA{218, 97, 229, 255} // purple
case "etcd__v3_1": case "etcd__v3_1":
return color.RGBA{0, 229, 255, 255} // cyan return color.RGBA{0, 229, 255, 255} // cyan
case "etcd__v3_2": case "etcd__v3_2":
@ -49,10 +47,6 @@ func GetRGBI(databaseID string, i int) color.Color {
return color.RGBA{24, 90, 169, 255} // blue return color.RGBA{24, 90, 169, 255} // blue
case "zookeeper__r3_5_3_beta": case "zookeeper__r3_5_3_beta":
return color.RGBA{94, 191, 30, 255} // green return color.RGBA{94, 191, 30, 255} // green
case "consul__v0_7_5":
return color.RGBA{198, 53, 53, 255} // red
case "consul__v0_8_0":
return color.RGBA{212, 88, 102, 255} // red
case "consul__v0_8_4": case "consul__v0_8_4":
return color.RGBA{254, 25, 102, 255} // red return color.RGBA{254, 25, 102, 255} // red
case "zetcd__beta": case "zetcd__beta":
@ -65,8 +59,6 @@ func GetRGBI(databaseID string, i int) color.Color {
func GetRGBII(databaseID string, i int) color.Color { func GetRGBII(databaseID string, i int) color.Color {
switch databaseID { switch databaseID {
case "etcd__v2_3":
return color.RGBA{229, 212, 231, 255} // light-purple
case "etcd__v3_1": case "etcd__v3_1":
return color.RGBA{132, 255, 255, 255} // light-cyan return color.RGBA{132, 255, 255, 255} // light-cyan
case "etcd__v3_2": case "etcd__v3_2":
@ -75,10 +67,6 @@ func GetRGBII(databaseID string, i int) color.Color {
return color.RGBA{129, 212, 247, 255} // light-blue return color.RGBA{129, 212, 247, 255} // light-blue
case "zookeeper__r3_5_3_beta": case "zookeeper__r3_5_3_beta":
return color.RGBA{155, 176, 29, 255} // light-green return color.RGBA{155, 176, 29, 255} // light-green
case "consul__v0_7_5":
return color.RGBA{247, 156, 156, 255} // light-red
case "consul__v0_8_0":
return color.RGBA{238, 148, 178, 255} // light-red
case "consul__v0_8_4": case "consul__v0_8_4":
return color.RGBA{255, 202, 178, 255} // light-red return color.RGBA{255, 202, 178, 255} // light-red
case "zetcd__beta": case "zetcd__beta":
@ -91,8 +79,6 @@ func GetRGBII(databaseID string, i int) color.Color {
func GetRGBIII(databaseID string, i int) color.Color { func GetRGBIII(databaseID string, i int) color.Color {
switch databaseID { switch databaseID {
case "etcd__v2_3":
return color.RGBA{165, 8, 180, 255} // deep-purple
case "etcd__v3_1": case "etcd__v3_1":
return color.RGBA{0, 96, 100, 255} // deep-cyan return color.RGBA{0, 96, 100, 255} // deep-cyan
case "etcd__v3_2": case "etcd__v3_2":
@ -101,10 +87,6 @@ func GetRGBIII(databaseID string, i int) color.Color {
return color.RGBA{37, 29, 191, 255} // deep-blue return color.RGBA{37, 29, 191, 255} // deep-blue
case "zookeeper__r3_5_3_beta": case "zookeeper__r3_5_3_beta":
return color.RGBA{129, 210, 178, 255} // mid-cyan return color.RGBA{129, 210, 178, 255} // mid-cyan
case "consul__v0_7_5":
return color.RGBA{212, 8, 46, 255} // deep-red
case "consul__v0_8_0":
return color.RGBA{251, 110, 84, 255} // deep-red
case "consul__v0_8_4": case "consul__v0_8_4":
return color.RGBA{245, 144, 84, 255} // deep-red return color.RGBA{245, 144, 84, 255} // deep-red
case "zetcd__beta": case "zetcd__beta":