diff --git a/bench-results/data/2016041601-config/control-01-consul.yaml b/bench-results/data/2016041601-config/control-01-consul.yaml index 7dfedab2..6298a15e 100644 --- a/bench-results/data/2016041601-config/control-01-consul.yaml +++ b/bench-results/data/2016041601-config/control-01-consul.yaml @@ -7,9 +7,9 @@ google_cloud_storage_bucket_name: dbtester-results google_cloud_storage_sub_directory: 2016041601 peer_ips: - - 10.240.0.17 - - 10.240.0.18 - - 10.240.0.19 + - 10.240.0.20 + - 10.240.0.21 + - 10.240.0.22 agent_port: 3500 database_port: 8500 diff --git a/bench-results/data/2016041601-config/control-01-etcdv2.yaml b/bench-results/data/2016041601-config/control-01-etcdv2.yaml index 3ee27a87..e0612213 100644 --- a/bench-results/data/2016041601-config/control-01-etcdv2.yaml +++ b/bench-results/data/2016041601-config/control-01-etcdv2.yaml @@ -7,9 +7,9 @@ google_cloud_storage_bucket_name: dbtester-results google_cloud_storage_sub_directory: 2016041601 peer_ips: - - 10.240.0.13 - - 10.240.0.14 - - 10.240.0.15 + - 10.240.0.16 + - 10.240.0.17 + - 10.240.0.18 agent_port: 3500 database_port: 2379 diff --git a/bench-results/data/2016041601-config/control-01-etcdv3.yaml b/bench-results/data/2016041601-config/control-01-etcdv3.yaml index b27ac331..d853a2a0 100644 --- a/bench-results/data/2016041601-config/control-01-etcdv3.yaml +++ b/bench-results/data/2016041601-config/control-01-etcdv3.yaml @@ -7,9 +7,9 @@ google_cloud_storage_bucket_name: dbtester-results google_cloud_storage_sub_directory: 2016041601 peer_ips: + - 10.240.0.7 - 10.240.0.13 - 10.240.0.14 - - 10.240.0.15 agent_port: 3500 database_port: 2379 diff --git a/bench-results/data/2016041601-config/control-01-zk.yaml b/bench-results/data/2016041601-config/control-01-zk.yaml index d2cb7390..44d186cb 100644 --- a/bench-results/data/2016041601-config/control-01-zk.yaml +++ b/bench-results/data/2016041601-config/control-01-zk.yaml @@ -7,9 +7,9 @@ google_cloud_storage_bucket_name: dbtester-results google_cloud_storage_sub_directory: 2016041601 peer_ips: - - 10.240.0.17 - - 10.240.0.18 - - 10.240.0.19 + - 10.240.0.24 + - 10.240.0.25 + - 10.240.0.26 agent_port: 3500 database_port: 2181 diff --git a/bench-results/data/2016041601-config/control-02-etcdv3.yaml b/bench-results/data/2016041601-config/control-02-etcdv3.yaml index 9654b78b..3e0d9b60 100644 --- a/bench-results/data/2016041601-config/control-02-etcdv3.yaml +++ b/bench-results/data/2016041601-config/control-02-etcdv3.yaml @@ -7,9 +7,9 @@ google_cloud_storage_bucket_name: dbtester-results google_cloud_storage_sub_directory: 2016041601 peer_ips: - - 10.240.0.17 - - 10.240.0.18 - - 10.240.0.19 + - 10.240.0.28 + - 10.240.0.29 + - 10.240.0.30 agent_port: 3500 database_port: 2181 diff --git a/bench-results/data/2016041601-config/control-03-etcdv3.yaml b/bench-results/data/2016041601-config/control-03-etcdv3.yaml index 681e5dd6..8dbe746c 100644 --- a/bench-results/data/2016041601-config/control-03-etcdv3.yaml +++ b/bench-results/data/2016041601-config/control-03-etcdv3.yaml @@ -7,9 +7,9 @@ google_cloud_storage_bucket_name: dbtester-results google_cloud_storage_sub_directory: 2016041601 peer_ips: - - 10.240.0.17 - - 10.240.0.18 - - 10.240.0.19 + - 10.240.0.32 + - 10.240.0.33 + - 10.240.0.34 agent_port: 3500 database_port: 2181 diff --git a/bench-results/data/2016041601-config/control-04-etcdv3-go1.6.yaml b/bench-results/data/2016041601-config/control-04-etcdv3-go1.6.yaml index 0070e928..45e3fcf8 100644 --- a/bench-results/data/2016041601-config/control-04-etcdv3-go1.6.yaml +++ b/bench-results/data/2016041601-config/control-04-etcdv3-go1.6.yaml @@ -7,9 +7,9 @@ google_cloud_storage_bucket_name: dbtester-results google_cloud_storage_sub_directory: 2016041601 peer_ips: - - 10.240.0.17 - - 10.240.0.18 - - 10.240.0.19 + - 10.240.0.36 + - 10.240.0.37 + - 10.240.0.38 agent_port: 3500 database_port: 2181 diff --git a/bench-results/data/2016041601-config/control-04-etcdv3-go1.7.yaml b/bench-results/data/2016041601-config/control-04-etcdv3-go1.7.yaml index 21e8f39d..b634cb0b 100644 --- a/bench-results/data/2016041601-config/control-04-etcdv3-go1.7.yaml +++ b/bench-results/data/2016041601-config/control-04-etcdv3-go1.7.yaml @@ -7,9 +7,9 @@ google_cloud_storage_bucket_name: dbtester-results google_cloud_storage_sub_directory: 2016041601 peer_ips: - - 10.240.0.17 - - 10.240.0.18 - - 10.240.0.19 + - 10.240.0.40 + - 10.240.0.41 + - 10.240.0.42 agent_port: 3500 database_port: 2181 diff --git a/control/control.go b/control/control.go index 58c30477..681cda25 100644 --- a/control/control.go +++ b/control/control.go @@ -124,6 +124,7 @@ func step1(cfg Config) error { req.GoogleCloudProjectName = cfg.GoogleCloudProjectName req.GoogleCloudStorageKey = cfg.GoogleCloudStorageKey req.GoogleCloudStorageBucketName = cfg.GoogleCloudStorageBucketName + req.GoogleCloudStorageSubDirectory = cfg.GoogleCloudStorageSubDirectory switch cfg.Database { case "etcdv2":