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

dbtester: fix wrong config field in "etcd__other" 

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
This commit is contained in:
Gyuho Lee 2018-05-10 15:33:30 -07:00
parent 79e64110f3
commit bb8a5809a6
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
config_dbtester.go
View File

@ -156,11 +156,11 @@ func ReadConfig(fpath string, analyze bool) (*Config, error) {
if v.DatabasePortToConnect == 0 {
v.DatabasePortToConnect = defaultEtcdClientPort
}
if v.Flag_Etcd_Tip.SnapshotCount == 0 {
v.Flag_Etcd_Tip.SnapshotCount = defaultEtcdSnapshotCount
if v.Flag_Etcd_Other.SnapshotCount == 0 {
v.Flag_Etcd_Other.SnapshotCount = defaultEtcdSnapshotCount
}
if v.Flag_Etcd_Tip.QuotaSizeBytes == 0 {
v.Flag_Etcd_Tip.QuotaSizeBytes = defaultEtcdQuotaSizeBytes
if v.Flag_Etcd_Other.QuotaSizeBytes == 0 {
v.Flag_Etcd_Other.QuotaSizeBytes = defaultEtcdQuotaSizeBytes
}
cfg.DatabaseIDToConfigClientMachineAgentControl[dbtesterpb.DatabaseID_etcd__other.String()] = v
}
@ -316,13 +316,13 @@ func (cfg *Config) ToRequest(databaseID string, op dbtesterpb.Operation, idx int
switch req.DatabaseID {
case dbtesterpb.DatabaseID_etcd__other:
if gcfg.Flag_Etcd_Tip.QuotaSizeBytes > maxEtcdQuotaSize {
err = fmt.Errorf("maximum etcd quota is 8 GB (%d), got %d", maxEtcdQuotaSize, gcfg.Flag_Etcd_Tip.QuotaSizeBytes)
if gcfg.Flag_Etcd_Other.QuotaSizeBytes > maxEtcdQuotaSize {
err = fmt.Errorf("maximum etcd quota is 8 GB (%d), got %d", maxEtcdQuotaSize, gcfg.Flag_Etcd_Other.QuotaSizeBytes)
return
}
req.Flag_Etcd_Other = &dbtesterpb.Flag_Etcd_Other{
SnapshotCount: gcfg.Flag_Etcd_Tip.SnapshotCount,
QuotaSizeBytes: gcfg.Flag_Etcd_Tip.QuotaSizeBytes,
SnapshotCount: gcfg.Flag_Etcd_Other.SnapshotCount,
QuotaSizeBytes: gcfg.Flag_Etcd_Other.QuotaSizeBytes,
}
case dbtesterpb.DatabaseID_etcd__tip:
if gcfg.Flag_Etcd_Tip.QuotaSizeBytes > maxEtcdQuotaSize {

2
scripts/dbtester-google-cloud.sh
View File

@ -467,7 +467,7 @@ sudo ntpdate time.google.com
sudo service ntp start
nohup dbtester control \
--database-id etcd__v3_3 \
--database-id etcd__v3_2 \
--config config.yaml > ${HOME}/client-control.log 2>&1 &
sleep 7s