diff --git a/config_dbtester_test.go b/config_dbtester_test.go index c9a0ccea..5f9b7a25 100644 --- a/config_dbtester_test.go +++ b/config_dbtester_test.go @@ -31,13 +31,13 @@ func TestConfig(t *testing.T) { TestDescription: `- Google Cloud Compute Engine - 4 machines of 16 vCPUs + 30 GB Memory + 150 GB SSD (1 for client) - Ubuntu 16.10 -- etcd v3.1 (Go 1.7.4) +- etcd v3.1 (Go 1.7.5) - Zookeeper r3.4.9 - Java 8 - javac 1.8.0_121 - Java(TM) SE Runtime Environment (build 1.8.0_121-b13) - Java HotSpot(TM) 64-Bit Server VM (build 25.121-b13, mixed mode) -- Consul v0.7.3 (Go 1.7.4) +- Consul v0.7.4 (Go 1.7.5) `, Control: Control{ PathPrefix: "/home/gyuho", @@ -60,8 +60,8 @@ func TestConfig(t *testing.T) { DatabaseIDToTestGroup: map[string]TestGroup{ "etcdv3": { DatabaseID: "etcdv3", - DatabaseTag: "etcd-v3.1-go1.7.4", - DatabaseDescription: "etcd v3.1 (Go 1.7.4)", + DatabaseTag: "etcd-v3.1-go1.7.5", + DatabaseDescription: "etcd v3.1 (Go 1.7.5)", PeerIPs: []string{"10.240.0.20", "10.240.0.21", "10.240.0.22"}, PeerIPsString: "10.240.0.20___10.240.0.21___10.240.0.22", DatabasePortToConnect: 2379, @@ -129,8 +129,8 @@ func TestConfig(t *testing.T) { }, "consul": { DatabaseID: "consul", - DatabaseTag: "consul-v0.7.3-go1.7.4", - DatabaseDescription: "Consul v0.7.3 (Go 1.7.4)", + DatabaseTag: "consul-v0.7.4-go1.7.5", + DatabaseDescription: "Consul v0.7.4 (Go 1.7.5)", PeerIPs: []string{"10.240.0.30", "10.240.0.31", "10.240.0.33"}, PeerIPsString: "10.240.0.30___10.240.0.31___10.240.0.33", DatabasePortToConnect: 8500, @@ -160,24 +160,24 @@ func TestConfig(t *testing.T) { DatabaseIDToTestData: map[string]TestData{ "etcdv3": { DatabaseID: "etcdv3", - DatabaseTag: "etcd-v3.1-go1.7.4", - DatabaseDescription: "etcd v3.1 (Go 1.7.4)", - PathPrefix: "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/etcd-v3.1-go1.7.4", + DatabaseTag: "etcd-v3.1-go1.7.5", + DatabaseDescription: "etcd v3.1 (Go 1.7.5)", + PathPrefix: "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/etcd-v3.1-go1.7.5", - ClientSystemMetricsInterpolatedPath: "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/etcd-v3.1-go1.7.4-client-system-metrics-interpolated.csv", - ClientLatencyThroughputTimeseriesPath: "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/etcd-v3.1-go1.7.4-client-latency-throughput-timeseries.csv", - ClientLatencyDistributionAllPath: "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/etcd-v3.1-go1.7.4-client-latency-distribution-all.csv", - ClientLatencyDistributionPercentilePath: "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/etcd-v3.1-go1.7.4-client-latency-distribution-percentile.csv", - ClientLatencyDistributionSummaryPath: "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/etcd-v3.1-go1.7.4-client-latency-distribution-summary.csv", - ClientLatencyByKeyNumberPath: "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/etcd-v3.1-go1.7.4-client-latency-by-key-number.csv", - ServerMemoryByKeyNumberPath: "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/etcd-v3.1-go1.7.4-server-memory-by-key-number.csv", - ServerDiskSpaceUsageSummaryPath: "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/etcd-v3.1-go1.7.4-server-disk-space-usage-summary.csv", + ClientSystemMetricsInterpolatedPath: "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/etcd-v3.1-go1.7.5-client-system-metrics-interpolated.csv", + ClientLatencyThroughputTimeseriesPath: "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/etcd-v3.1-go1.7.5-client-latency-throughput-timeseries.csv", + ClientLatencyDistributionAllPath: "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/etcd-v3.1-go1.7.5-client-latency-distribution-all.csv", + ClientLatencyDistributionPercentilePath: "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/etcd-v3.1-go1.7.5-client-latency-distribution-percentile.csv", + ClientLatencyDistributionSummaryPath: "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/etcd-v3.1-go1.7.5-client-latency-distribution-summary.csv", + ClientLatencyByKeyNumberPath: "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/etcd-v3.1-go1.7.5-client-latency-by-key-number.csv", + ServerMemoryByKeyNumberPath: "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/etcd-v3.1-go1.7.5-server-memory-by-key-number.csv", + ServerDiskSpaceUsageSummaryPath: "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/etcd-v3.1-go1.7.5-server-disk-space-usage-summary.csv", ServerSystemMetricsInterpolatedPathList: []string{ - "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/etcd-v3.1-go1.7.4-1-server-system-metrics-interpolated.csv", - "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/etcd-v3.1-go1.7.4-2-server-system-metrics-interpolated.csv", - "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/etcd-v3.1-go1.7.4-3-server-system-metrics-interpolated.csv", + "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/etcd-v3.1-go1.7.5-1-server-system-metrics-interpolated.csv", + "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/etcd-v3.1-go1.7.5-2-server-system-metrics-interpolated.csv", + "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/etcd-v3.1-go1.7.5-3-server-system-metrics-interpolated.csv", }, - AllAggregatedOutputPath: "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/etcd-v3.1-go1.7.4-all-aggregated.csv", + AllAggregatedOutputPath: "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/etcd-v3.1-go1.7.5-all-aggregated.csv", }, "zookeeper": { DatabaseID: "zookeeper", @@ -202,24 +202,24 @@ func TestConfig(t *testing.T) { }, "consul": { DatabaseID: "consul", - DatabaseTag: "consul-v0.7.3-go1.7.4", - DatabaseDescription: "Consul v0.7.3 (Go 1.7.4)", - PathPrefix: "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/consul-v0.7.3-go1.7.4", + DatabaseTag: "consul-v0.7.4-go1.7.5", + DatabaseDescription: "Consul v0.7.4 (Go 1.7.5)", + PathPrefix: "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/consul-v0.7.4-go1.7.5", - ClientSystemMetricsInterpolatedPath: "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/consul-v0.7.3-go1.7.4-client-system-metrics-interpolated.csv", - ClientLatencyThroughputTimeseriesPath: "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/consul-v0.7.3-go1.7.4-client-latency-throughput-timeseries.csv", - ClientLatencyDistributionAllPath: "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/consul-v0.7.3-go1.7.4-client-latency-distribution-all.csv", - ClientLatencyDistributionPercentilePath: "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/consul-v0.7.3-go1.7.4-client-latency-distribution-percentile.csv", - ClientLatencyDistributionSummaryPath: "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/consul-v0.7.3-go1.7.4-client-latency-distribution-summary.csv", - ClientLatencyByKeyNumberPath: "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/consul-v0.7.3-go1.7.4-client-latency-by-key-number.csv", - ServerMemoryByKeyNumberPath: "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/consul-v0.7.3-go1.7.4-server-memory-by-key-number.csv", - ServerDiskSpaceUsageSummaryPath: "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/consul-v0.7.3-go1.7.4-server-disk-space-usage-summary.csv", + ClientSystemMetricsInterpolatedPath: "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/consul-v0.7.4-go1.7.5-client-system-metrics-interpolated.csv", + ClientLatencyThroughputTimeseriesPath: "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/consul-v0.7.4-go1.7.5-client-latency-throughput-timeseries.csv", + ClientLatencyDistributionAllPath: "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/consul-v0.7.4-go1.7.5-client-latency-distribution-all.csv", + ClientLatencyDistributionPercentilePath: "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/consul-v0.7.4-go1.7.5-client-latency-distribution-percentile.csv", + ClientLatencyDistributionSummaryPath: "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/consul-v0.7.4-go1.7.5-client-latency-distribution-summary.csv", + ClientLatencyByKeyNumberPath: "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/consul-v0.7.4-go1.7.5-client-latency-by-key-number.csv", + ServerMemoryByKeyNumberPath: "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/consul-v0.7.4-go1.7.5-server-memory-by-key-number.csv", + ServerDiskSpaceUsageSummaryPath: "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/consul-v0.7.4-go1.7.5-server-disk-space-usage-summary.csv", ServerSystemMetricsInterpolatedPathList: []string{ - "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/consul-v0.7.3-go1.7.4-1-server-system-metrics-interpolated.csv", - "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/consul-v0.7.3-go1.7.4-2-server-system-metrics-interpolated.csv", - "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/consul-v0.7.3-go1.7.4-3-server-system-metrics-interpolated.csv", + "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/consul-v0.7.4-go1.7.5-1-server-system-metrics-interpolated.csv", + "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/consul-v0.7.4-go1.7.5-2-server-system-metrics-interpolated.csv", + "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/consul-v0.7.4-go1.7.5-3-server-system-metrics-interpolated.csv", }, - AllAggregatedOutputPath: "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/consul-v0.7.3-go1.7.4-all-aggregated.csv", + AllAggregatedOutputPath: "2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/consul-v0.7.4-go1.7.5-all-aggregated.csv", }, }, Analyze: Analyze{ @@ -448,7 +448,7 @@ func TestConfig(t *testing.T) { Operation: dbtesterpb.Request_Start, TriggerLogUpload: true, DatabaseID: dbtesterpb.Request_etcdv3, - DatabaseTag: "etcd-v3.1-go1.7.4", + DatabaseTag: "etcd-v3.1-go1.7.5", PeerIPsString: "10.240.0.20___10.240.0.21___10.240.0.22", IpIndex: 0, CurrentClientNumber: 0, diff --git a/config_dbtester_test.yaml b/config_dbtester_test.yaml index ed1493d1..3e7ee57b 100644 --- a/config_dbtester_test.yaml +++ b/config_dbtester_test.yaml @@ -3,13 +3,13 @@ test_description: | - Google Cloud Compute Engine - 4 machines of 16 vCPUs + 30 GB Memory + 150 GB SSD (1 for client) - Ubuntu 16.10 - - etcd v3.1 (Go 1.7.4) + - etcd v3.1 (Go 1.7.5) - Zookeeper r3.4.9 - Java 8 - javac 1.8.0_121 - Java(TM) SE Runtime Environment (build 1.8.0_121-b13) - Java HotSpot(TM) 64-Bit Server VM (build 25.121-b13, mixed mode) - - Consul v0.7.3 (Go 1.7.4) + - Consul v0.7.4 (Go 1.7.5) # common control options for all client machines control: @@ -37,7 +37,7 @@ all_database_id_list: [etcdv3, zookeeper, consul] datatbase_id_to_test_group: etcdv3: - database_description: etcd v3.1 (Go 1.7.4) + database_description: etcd v3.1 (Go 1.7.5) peer_ips: - 10.240.0.20 - 10.240.0.21 @@ -132,7 +132,7 @@ datatbase_id_to_test_group: step4_upload_logs: true consul: - database_description: Consul v0.7.3 (Go 1.7.4) + database_description: Consul v0.7.4 (Go 1.7.5) peer_ips: - 10.240.0.30 - 10.240.0.31 @@ -168,7 +168,7 @@ datatbase_id_to_test_group: datatbase_id_to_test_data: etcdv3: # if not empty, all test data paths are prefixed - path_prefix: 2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/etcd-v3.1-go1.7.4 + path_prefix: 2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/etcd-v3.1-go1.7.5 client_system_metrics_interpolated_path: client-system-metrics-interpolated.csv client_latency_throughput_timeseries_path: client-latency-throughput-timeseries.csv client_latency_distribution_all_path: client-latency-distribution-all.csv @@ -202,7 +202,7 @@ datatbase_id_to_test_data: consul: # if not empty, all test data paths are prefixed - path_prefix: 2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/consul-v0.7.3-go1.7.4 + path_prefix: 2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/consul-v0.7.4-go1.7.5 client_system_metrics_interpolated_path: client-system-metrics-interpolated.csv client_latency_throughput_timeseries_path: client-latency-throughput-timeseries.csv client_latency_distribution_all_path: client-latency-distribution-all.csv diff --git a/test-configs/01-write-1M-keys-client-variable.yaml b/test-configs/01-write-1M-keys-client-variable.yaml index eb65120c..d85274b4 100644 --- a/test-configs/01-write-1M-keys-client-variable.yaml +++ b/test-configs/01-write-1M-keys-client-variable.yaml @@ -3,13 +3,13 @@ test_description: | - Google Cloud Compute Engine - 4 machines of 16 vCPUs + 30 GB Memory + 150 GB SSD (1 for client) - Ubuntu 16.10 - - etcd v3.1 (Go 1.7.4) + - etcd v3.1 (Go 1.7.5) - Zookeeper r3.4.9 - Java 8 - javac 1.8.0_121 - Java(TM) SE Runtime Environment (build 1.8.0_121-b13) - Java HotSpot(TM) 64-Bit Server VM (build 25.121-b13, mixed mode) - - Consul v0.7.3 (Go 1.7.4) + - Consul v0.7.4 (Go 1.7.5) # common control options for all client machines control: @@ -36,7 +36,7 @@ all_database_id_list: [etcdv3, zookeeper, consul] datatbase_id_to_test_group: etcdv3: - database_description: etcd v3.1 (Go 1.7.4) + database_description: etcd v3.1 (Go 1.7.5) peer_ips: - 10.240.0.20 - 10.240.0.21 @@ -131,7 +131,7 @@ datatbase_id_to_test_group: step4_upload_logs: true consul: - database_description: Consul v0.7.3 (Go 1.7.4) + database_description: Consul v0.7.4 (Go 1.7.5) peer_ips: - 10.240.0.30 - 10.240.0.31 @@ -167,7 +167,7 @@ datatbase_id_to_test_group: datatbase_id_to_test_data: etcdv3: # if not empty, all test data paths are prefixed - path_prefix: 2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/etcd-v3.1-go1.7.4 + path_prefix: 2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/etcd-v3.1-go1.7.5 client_system_metrics_interpolated_path: client-system-metrics-interpolated.csv client_latency_throughput_timeseries_path: client-latency-throughput-timeseries.csv client_latency_distribution_all_path: client-latency-distribution-all.csv @@ -201,7 +201,7 @@ datatbase_id_to_test_data: consul: # if not empty, all test data paths are prefixed - path_prefix: 2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/consul-v0.7.3-go1.7.4 + path_prefix: 2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/consul-v0.7.4-go1.7.5 client_system_metrics_interpolated_path: client-system-metrics-interpolated.csv client_latency_throughput_timeseries_path: client-latency-throughput-timeseries.csv client_latency_distribution_all_path: client-latency-distribution-all.csv diff --git a/test-configs/02-write-1M-keys-best-throughput.yaml b/test-configs/02-write-1M-keys-best-throughput.yaml index 9e9c938f..3f2fb398 100644 --- a/test-configs/02-write-1M-keys-best-throughput.yaml +++ b/test-configs/02-write-1M-keys-best-throughput.yaml @@ -3,13 +3,13 @@ test_description: | - Google Cloud Compute Engine - 4 machines of 16 vCPUs + 30 GB Memory + 150 GB SSD (1 for client) - Ubuntu 16.10 - - etcd v3.1 (Go 1.7.4) + - etcd v3.1 (Go 1.7.5) - Zookeeper r3.4.9 - Java 8 - javac 1.8.0_121 - Java(TM) SE Runtime Environment (build 1.8.0_121-b13) - Java HotSpot(TM) 64-Bit Server VM (build 25.121-b13, mixed mode) - - Consul v0.7.3 (Go 1.7.4) + - Consul v0.7.4 (Go 1.7.5) # common control options for all client machines control: @@ -36,7 +36,7 @@ all_database_id_list: [etcdv3, zookeeper, consul] datatbase_id_to_test_group: etcdv3: - database_description: etcd v3.1 (Go 1.7.4) + database_description: etcd v3.1 (Go 1.7.5) peer_ips: - 10.240.0.20 - 10.240.0.21 @@ -131,7 +131,7 @@ datatbase_id_to_test_group: step4_upload_logs: true consul: - database_description: Consul v0.7.3 (Go 1.7.4) + database_description: Consul v0.7.4 (Go 1.7.5) peer_ips: - 10.240.0.30 - 10.240.0.31 @@ -167,7 +167,7 @@ datatbase_id_to_test_group: datatbase_id_to_test_data: etcdv3: # if not empty, all test data paths are prefixed - path_prefix: 2017Q1-00-etcd-zookeeper-consul/02-write-1M-keys-best-throughput/etcd-v3.1-go1.7.4 + path_prefix: 2017Q1-00-etcd-zookeeper-consul/02-write-1M-keys-best-throughput/etcd-v3.1-go1.7.5 client_system_metrics_interpolated_path: client-system-metrics-interpolated.csv client_latency_throughput_timeseries_path: client-latency-throughput-timeseries.csv client_latency_distribution_all_path: client-latency-distribution-all.csv @@ -201,7 +201,7 @@ datatbase_id_to_test_data: consul: # if not empty, all test data paths are prefixed - path_prefix: 2017Q1-00-etcd-zookeeper-consul/02-write-1M-keys-best-throughput/consul-v0.7.3-go1.7.4 + path_prefix: 2017Q1-00-etcd-zookeeper-consul/02-write-1M-keys-best-throughput/consul-v0.7.4-go1.7.5 client_system_metrics_interpolated_path: client-system-metrics-interpolated.csv client_latency_throughput_timeseries_path: client-latency-throughput-timeseries.csv client_latency_distribution_all_path: client-latency-distribution-all.csv diff --git a/test-configs/03-write-1M-keys-1000-client.yaml b/test-configs/03-write-1M-keys-1000-client.yaml index 97a06c59..339e482d 100644 --- a/test-configs/03-write-1M-keys-1000-client.yaml +++ b/test-configs/03-write-1M-keys-1000-client.yaml @@ -3,13 +3,13 @@ test_description: | - Google Cloud Compute Engine - 4 machines of 16 vCPUs + 30 GB Memory + 150 GB SSD (1 for client) - Ubuntu 16.10 - - etcd v3.1 (Go 1.7.4) + - etcd v3.1 (Go 1.7.5) - Zookeeper r3.4.9 - Java 8 - javac 1.8.0_121 - Java(TM) SE Runtime Environment (build 1.8.0_121-b13) - Java HotSpot(TM) 64-Bit Server VM (build 25.121-b13, mixed mode) - - Consul v0.7.3 (Go 1.7.4) + - Consul v0.7.4 (Go 1.7.5) # common control options for all client machines control: @@ -36,7 +36,7 @@ all_database_id_list: [etcdv3, zookeeper, consul] datatbase_id_to_test_group: etcdv3: - database_description: etcd v3.1 (Go 1.7.4) + database_description: etcd v3.1 (Go 1.7.5) peer_ips: - 10.240.0.20 - 10.240.0.21 @@ -131,7 +131,7 @@ datatbase_id_to_test_group: step4_upload_logs: true consul: - database_description: Consul v0.7.3 (Go 1.7.4) + database_description: Consul v0.7.4 (Go 1.7.5) peer_ips: - 10.240.0.30 - 10.240.0.31 @@ -167,7 +167,7 @@ datatbase_id_to_test_group: datatbase_id_to_test_data: etcdv3: # if not empty, all test data paths are prefixed - path_prefix: 2017Q1-00-etcd-zookeeper-consul/03-write-1M-keys-1000-client/etcd-v3.1-go1.7.4 + path_prefix: 2017Q1-00-etcd-zookeeper-consul/03-write-1M-keys-1000-client/etcd-v3.1-go1.7.5 client_system_metrics_interpolated_path: client-system-metrics-interpolated.csv client_latency_throughput_timeseries_path: client-latency-throughput-timeseries.csv client_latency_distribution_all_path: client-latency-distribution-all.csv @@ -201,7 +201,7 @@ datatbase_id_to_test_data: consul: # if not empty, all test data paths are prefixed - path_prefix: 2017Q1-00-etcd-zookeeper-consul/03-write-1M-keys-1000-client/consul-v0.7.3-go1.7.4 + path_prefix: 2017Q1-00-etcd-zookeeper-consul/03-write-1M-keys-1000-client/consul-v0.7.4-go1.7.5 client_system_metrics_interpolated_path: client-system-metrics-interpolated.csv client_latency_throughput_timeseries_path: client-latency-throughput-timeseries.csv client_latency_distribution_all_path: client-latency-distribution-all.csv diff --git a/test-configs/04-write-too-many-keys.yaml b/test-configs/04-write-too-many-keys.yaml index aca685b5..9045aa13 100644 --- a/test-configs/04-write-too-many-keys.yaml +++ b/test-configs/04-write-too-many-keys.yaml @@ -3,13 +3,13 @@ test_description: | - Google Cloud Compute Engine - 4 machines of 16 vCPUs + 30 GB Memory + 150 GB SSD (1 for client) - Ubuntu 16.10 - - etcd v3.1 (Go 1.7.4) + - etcd v3.1 (Go 1.7.5) - Zookeeper r3.4.9 - Java 8 - javac 1.8.0_121 - Java(TM) SE Runtime Environment (build 1.8.0_121-b13) - Java HotSpot(TM) 64-Bit Server VM (build 25.121-b13, mixed mode) - - Consul v0.7.3 (Go 1.7.4) + - Consul v0.7.4 (Go 1.7.5) # common control options for all client machines control: @@ -36,7 +36,7 @@ all_database_id_list: [etcdv3, zookeeper, consul] datatbase_id_to_test_group: etcdv3: - database_description: etcd v3.1 (Go 1.7.4) + database_description: etcd v3.1 (Go 1.7.5) peer_ips: - 10.240.0.20 - 10.240.0.21 @@ -131,7 +131,7 @@ datatbase_id_to_test_group: step4_upload_logs: true consul: - database_description: Consul v0.7.3 (Go 1.7.4) + database_description: Consul v0.7.4 (Go 1.7.5) peer_ips: - 10.240.0.30 - 10.240.0.31 @@ -167,7 +167,7 @@ datatbase_id_to_test_group: datatbase_id_to_test_data: etcdv3: # if not empty, all test data paths are prefixed - path_prefix: 2017Q1-00-etcd-zookeeper-consul/04-write-too-many-keys/etcd-v3.1-go1.7.4 + path_prefix: 2017Q1-00-etcd-zookeeper-consul/04-write-too-many-keys/etcd-v3.1-go1.7.5 client_system_metrics_interpolated_path: client-system-metrics-interpolated.csv client_latency_throughput_timeseries_path: client-latency-throughput-timeseries.csv client_latency_distribution_all_path: client-latency-distribution-all.csv @@ -201,7 +201,7 @@ datatbase_id_to_test_data: consul: # if not empty, all test data paths are prefixed - path_prefix: 2017Q1-00-etcd-zookeeper-consul/04-write-too-many-keys/consul-v0.7.3-go1.7.4 + path_prefix: 2017Q1-00-etcd-zookeeper-consul/04-write-too-many-keys/consul-v0.7.4-go1.7.5 client_system_metrics_interpolated_path: client-system-metrics-interpolated.csv client_latency_throughput_timeseries_path: client-latency-throughput-timeseries.csv client_latency_distribution_all_path: client-latency-distribution-all.csv diff --git a/test-configs/install-consul.sh b/test-configs/install-consul.sh index 63793837..8c30688b 100755 --- a/test-configs/install-consul.sh +++ b/test-configs/install-consul.sh @@ -1,18 +1,13 @@ #!/usr/bin/env bash set -e -echo "Downloading Consul..." rm -f /tmp/consul.zip -curl -sf -o /tmp/consul.zip https://releases.hashicorp.com/consul/0.7.3/consul_0.7.3_linux_amd64.zip +curl -sf -o /tmp/consul.zip https://releases.hashicorp.com/consul/0.7.4/consul_0.7.4_linux_amd64.zip -printf "\n" -echo "Extracting Consul..." rm -f ${GOPATH}/bin/consul unzip /tmp/consul.zip -d ${GOPATH}/bin rm -f /tmp/consul.zip -printf "\n" -echo "Done!" consul version < $HOME/control.log 2>&1 & +nohup dbtester control --database-id etcdv3 --config config.yaml > $HOME/control.log 2>&1 & nohup dbtester control --database-id zookeeper --config config.yaml > $HOME/control.log 2>&1 & -nohup dbtester control --database-id consul --config config.yaml > $HOME/control.log 2>&1 & +nohup dbtester control --database-id consul --config config.yaml > $HOME/control.log 2>&1 & # analyze; get all data from remote machines # and specify 'analyze' configuration file,