diff --git a/scripts/dbtester-google-cloud.sh b/scripts/dbtester-google-cloud.sh index c763e1b5..a6490fb3 100755 --- a/scripts/dbtester-google-cloud.sh +++ b/scripts/dbtester-google-cloud.sh @@ -131,10 +131,10 @@ sudo service ntp start sudo rm -rf ${HOME}/* # etcd v3.2.0 -GO_VERSION=1.8.3 +# GO_VERSION=1.8.3 # etcd v3.3.0 -# GO_VERSION=1.9.2 +GO_VERSION=1.9.2 sudo rm -f /usr/local/go/bin/go && sudo rm -rf /usr/local/go && sudo rm -f /bin/go @@ -163,8 +163,8 @@ go version GIT_PATH=github.com/coreos/etcd USER_NAME=coreos -BRANCH_NAME=release-3.2 -# BRANCH_NAME=release-3.3 +# BRANCH_NAME=release-3.2 +BRANCH_NAME=release-3.3 rm -rf ${GOPATH}/src/${GIT_PATH} mkdir -p ${GOPATH}/src/github.com/coreos @@ -176,7 +176,7 @@ git clone https://github.com/${USER_NAME}/etcd \ cd ${GOPATH}/src/${GIT_PATH} # v3.2.0 -git reset --hard 66722b1ada68fcd5227db853ee92003169a975c8 +# git reset --hard 66722b1ada68fcd5227db853ee92003169a975c8 # v3.3.0 RC+ # git reset --hard 58c402a47bc5ad46fa748ce666257b45b06b1444 @@ -259,7 +259,7 @@ sudo ntpdate time.google.com sudo service ntp start nohup dbtester control \ - --database-id etcd__v3_2 \ + --database-id etcd__v3_3 \ --config config.yaml > ${HOME}/client-control.log 2>&1 & sleep 10s diff --git a/test-configs/write-1M-keys-best-throughput.yaml b/test-configs/write-1M-keys-best-throughput.yaml index c88df65e..749a060a 100644 --- a/test-configs/write-1M-keys-best-throughput.yaml +++ b/test-configs/write-1M-keys-best-throughput.yaml @@ -4,7 +4,6 @@ test_description: | - 4 machines of 16 vCPUs + 60 GB Memory + 300 GB SSD (1 for client) - Ubuntu 17.10 (GNU/Linux kernel 4.13.0-25-generic) - `ulimit -n` is 120000 - - etcd v3.2.0 (Go 1.8.3) - etcd v3.3.0 (Go 1.9.2) - Zookeeper r3.5.3-beta - Java 8 @@ -35,49 +34,9 @@ config_client_machine_initial: google_cloud_storage_bucket_name: dbtester-results google_cloud_storage_sub_directory: 2018Q1-02-etcd-zookeeper-consul/write-1M-keys-best-throughput -all_database_id_list: [etcd__v3_2, etcd__v3_3, zookeeper__r3_5_3_beta, consul__v1_0_2] +all_database_id_list: [etcd__v3_3, zookeeper__r3_5_3_beta, consul__v1_0_2] datatbase_id_to_config_client_machine_agent_control: - etcd__v3_2: - database_description: etcd v3.2.0 (Go 1.8.3) - peer_ips: - - 10.138.0.2 - - 10.138.0.3 - - 10.138.0.4 - database_port_to_connect: 2379 - agent_port_to_connect: 3500 - - etcd__v3_2: - # --snapshot-count - snap_count: 100000 - # --quota-backend-bytes; 8 GB - quota_size_bytes: 8000000000 - - benchmark_options: - type: write - request_number: 1000000 - # connection_number: 1000 # for best throughput - connection_number: 100 # for best throughput - client_number: 1000 # for best throughput - # if specified, overwrite 'connection_number', 'connection_number' - connection_client_numbers: [] - - # 0, to not rate limit - rate_limit_requests_per_second: 0 - - # for 'write', 'read' - same_key: false - key_size_bytes: 256 - value_size_bytes: 1024 - - stale_read: false - - benchmark_steps: - step1_start_database: true - step2_stress_database: true - step3_stop_database: true - step4_upload_logs: true - etcd__v3_3: database_description: etcd v3.3.0 (Go 1.9.2) peer_ips: @@ -217,25 +176,6 @@ datatbase_id_to_config_client_machine_agent_control: datatbase_id_to_config_analyze_machine_initial: - etcd__v3_2: - # if not empty, all test data paths are prefixed - path_prefix: 2018Q1-02-etcd-zookeeper-consul/write-1M-keys-best-throughput/etcd-v3.2.0-go1.8.3 - 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 - client_latency_distribution_percentile_path: client-latency-distribution-percentile.csv - client_latency_distribution_summary_path: client-latency-distribution-summary.csv - client_latency_by_key_number_path: client-latency-by-key-number.csv - server_disk_space_usage_summary_path: server-disk-space-usage-summary.csv - server_memory_by_key_number_path: server-memory-by-key-number.csv - server_read_bytes_delta_by_key_number_path: server-read-bytes-delta-by-key-number.csv - server_write_bytes_delta_by_key_number_path: server-write-bytes-delta-by-key-number.csv - server_system_metrics_interpolated_path_list: - - 1-server-system-metrics-interpolated.csv - - 2-server-system-metrics-interpolated.csv - - 3-server-system-metrics-interpolated.csv - all_aggregated_output_path: all-aggregated.csv - etcd__v3_3: # if not empty, all test data paths are prefixed path_prefix: 2018Q1-02-etcd-zookeeper-consul/write-1M-keys-best-throughput/etcd-v3.3.0-go1.9.2