scripts,test-results: update for new tests

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>

scripts/dbtester-google-cloud.sh

@@ -5,7 +5,7 @@ set -e
 # create compute instances
 
 gcloud compute instances create \
-  bench-agent-1 \
+  bench-agent-a-1 \
   --custom-cpu=16 \
   --custom-memory=60 \
   --image-family=ubuntu-1710 \
@@ -18,7 +18,7 @@ gcloud compute instances create \
   --restart-on-failure
 
 gcloud compute instances create \
-  bench-agent-2 \
+  bench-agent-a-2 \
   --custom-cpu=16 \
   --custom-memory=60 \
   --image-family=ubuntu-1710 \
@@ -31,7 +31,7 @@ gcloud compute instances create \
   --restart-on-failure
 
 gcloud compute instances create \
-  bench-agent-3 \
+  bench-agent-a-3 \
   --custom-cpu=16 \
   --custom-memory=60 \
   --image-family=ubuntu-1710 \
@@ -45,7 +45,175 @@ gcloud compute instances create \
 
 export GCP_KEY_PATH=/etc/gcp-key-etcd-development.json
 gcloud compute instances create \
-  bench-tester \
+  bench-tester-a \
+  --custom-cpu=16 \
+  --custom-memory=60 \
+  --image-family=ubuntu-1710 \
+  --image-project=ubuntu-os-cloud \
+  --boot-disk-size=300 \
+  --boot-disk-type="pd-ssd" \
+  --network dbtester \
+  --zone us-west1-a \
+  --maintenance-policy=MIGRATE \
+  --restart-on-failure \
+  --metadata-from-file gcp-key-etcd=${GCP_KEY_PATH}
+
+
+
+gcloud compute instances create \
+  bench-agent-b-1 \
+  --custom-cpu=16 \
+  --custom-memory=60 \
+  --image-family=ubuntu-1710 \
+  --image-project=ubuntu-os-cloud \
+  --boot-disk-size=300 \
+  --boot-disk-type="pd-ssd" \
+  --network dbtester \
+  --zone us-west1-a \
+  --maintenance-policy=MIGRATE \
+  --restart-on-failure
+
+gcloud compute instances create \
+  bench-agent-b-2 \
+  --custom-cpu=16 \
+  --custom-memory=60 \
+  --image-family=ubuntu-1710 \
+  --image-project=ubuntu-os-cloud \
+  --boot-disk-size=300 \
+  --boot-disk-type="pd-ssd" \
+  --network dbtester \
+  --zone us-west1-a \
+  --maintenance-policy=MIGRATE \
+  --restart-on-failure
+
+gcloud compute instances create \
+  bench-agent-b-3 \
+  --custom-cpu=16 \
+  --custom-memory=60 \
+  --image-family=ubuntu-1710 \
+  --image-project=ubuntu-os-cloud \
+  --boot-disk-size=300 \
+  --boot-disk-type="pd-ssd" \
+  --network dbtester \
+  --zone us-west1-a \
+  --maintenance-policy=MIGRATE \
+  --restart-on-failure
+
+export GCP_KEY_PATH=/etc/gcp-key-etcd-development.json
+gcloud compute instances create \
+  bench-tester-b \
+  --custom-cpu=16 \
+  --custom-memory=60 \
+  --image-family=ubuntu-1710 \
+  --image-project=ubuntu-os-cloud \
+  --boot-disk-size=300 \
+  --boot-disk-type="pd-ssd" \
+  --network dbtester \
+  --zone us-west1-a \
+  --maintenance-policy=MIGRATE \
+  --restart-on-failure \
+  --metadata-from-file gcp-key-etcd=${GCP_KEY_PATH}
+
+
+
+gcloud compute instances create \
+  bench-agent-c-1 \
+  --custom-cpu=16 \
+  --custom-memory=60 \
+  --image-family=ubuntu-1710 \
+  --image-project=ubuntu-os-cloud \
+  --boot-disk-size=300 \
+  --boot-disk-type="pd-ssd" \
+  --network dbtester \
+  --zone us-west1-a \
+  --maintenance-policy=MIGRATE \
+  --restart-on-failure
+
+gcloud compute instances create \
+  bench-agent-c-2 \
+  --custom-cpu=16 \
+  --custom-memory=60 \
+  --image-family=ubuntu-1710 \
+  --image-project=ubuntu-os-cloud \
+  --boot-disk-size=300 \
+  --boot-disk-type="pd-ssd" \
+  --network dbtester \
+  --zone us-west1-a \
+  --maintenance-policy=MIGRATE \
+  --restart-on-failure
+
+gcloud compute instances create \
+  bench-agent-c-3 \
+  --custom-cpu=16 \
+  --custom-memory=60 \
+  --image-family=ubuntu-1710 \
+  --image-project=ubuntu-os-cloud \
+  --boot-disk-size=300 \
+  --boot-disk-type="pd-ssd" \
+  --network dbtester \
+  --zone us-west1-a \
+  --maintenance-policy=MIGRATE \
+  --restart-on-failure
+
+export GCP_KEY_PATH=/etc/gcp-key-etcd-development.json
+gcloud compute instances create \
+  bench-tester-c \
+  --custom-cpu=16 \
+  --custom-memory=60 \
+  --image-family=ubuntu-1710 \
+  --image-project=ubuntu-os-cloud \
+  --boot-disk-size=300 \
+  --boot-disk-type="pd-ssd" \
+  --network dbtester \
+  --zone us-west1-a \
+  --maintenance-policy=MIGRATE \
+  --restart-on-failure \
+  --metadata-from-file gcp-key-etcd=${GCP_KEY_PATH}
+
+
+
+gcloud compute instances create \
+  bench-agent-d-1 \
+  --custom-cpu=16 \
+  --custom-memory=60 \
+  --image-family=ubuntu-1710 \
+  --image-project=ubuntu-os-cloud \
+  --boot-disk-size=300 \
+  --boot-disk-type="pd-ssd" \
+  --network dbtester \
+  --zone us-west1-a \
+  --maintenance-policy=MIGRATE \
+  --restart-on-failure
+
+gcloud compute instances create \
+  bench-agent-d-2 \
+  --custom-cpu=16 \
+  --custom-memory=60 \
+  --image-family=ubuntu-1710 \
+  --image-project=ubuntu-os-cloud \
+  --boot-disk-size=300 \
+  --boot-disk-type="pd-ssd" \
+  --network dbtester \
+  --zone us-west1-a \
+  --maintenance-policy=MIGRATE \
+  --restart-on-failure
+
+gcloud compute instances create \
+  bench-agent-d-3 \
+  --custom-cpu=16 \
+  --custom-memory=60 \
+  --image-family=ubuntu-1710 \
+  --image-project=ubuntu-os-cloud \
+  --boot-disk-size=300 \
+  --boot-disk-type="pd-ssd" \
+  --network dbtester \
+  --zone us-west1-a \
+  --maintenance-policy=MIGRATE \
+  --restart-on-failure
+
+export GCP_KEY_PATH=/etc/gcp-key-etcd-development.json
+gcloud compute instances create \
+  bench-tester-d \
   --custom-cpu=16 \
   --custom-memory=60 \
   --image-family=ubuntu-1710 \
@@ -61,10 +229,25 @@ gcloud compute instances create \
 
 
 ##################################################
-gcloud compute ssh --zone=us-west1-a bench-agent-1
-gcloud compute ssh --zone=us-west1-a bench-agent-2
-gcloud compute ssh --zone=us-west1-a bench-agent-3
-gcloud compute ssh --zone=us-west1-a bench-tester
+gcloud compute ssh --zone=us-west1-a bench-agent-a-1
+gcloud compute ssh --zone=us-west1-a bench-agent-a-2
+gcloud compute ssh --zone=us-west1-a bench-agent-a-3
+gcloud compute ssh --zone=us-west1-a bench-tester-a
+
+gcloud compute ssh --zone=us-west1-a bench-agent-b-1
+gcloud compute ssh --zone=us-west1-a bench-agent-b-2
+gcloud compute ssh --zone=us-west1-a bench-agent-b-3
+gcloud compute ssh --zone=us-west1-a bench-tester-b
+
+gcloud compute ssh --zone=us-west1-a bench-agent-c-1
+gcloud compute ssh --zone=us-west1-a bench-agent-c-2
+gcloud compute ssh --zone=us-west1-a bench-agent-c-3
+gcloud compute ssh --zone=us-west1-a bench-tester-c
+
+gcloud compute ssh --zone=us-west1-a bench-agent-d-1
+gcloud compute ssh --zone=us-west1-a bench-agent-d-2
+gcloud compute ssh --zone=us-west1-a bench-agent-d-3
+gcloud compute ssh --zone=us-west1-a bench-tester-d
 
 gcloud compute instances list
 

scripts/install-etcd.sh

@@ -4,8 +4,15 @@ set -e
 GIT_PATH=github.com/coreos/etcd
 
 USER_NAME=coreos
+BRANCH_NAME=release-3.2
+BRANCH_NAME=release-3.3
 BRANCH_NAME=master
 
+<<COMMENT
+USER_NAME=gyuho
+BRANCH_NAME=new-balancer-april-2018
+COMMENT
+
 rm -rf ${GOPATH}/src/${GIT_PATH}
 mkdir -p ${GOPATH}/src/github.com/coreos
 
@@ -15,7 +22,9 @@ git clone https://github.com/${USER_NAME}/etcd \
 
 cd ${GOPATH}/src/${GIT_PATH}
 
-git reset --hard HEAD
+<<COMMENT
+git reset --hard 67b1ff6724637f0a00f693471ddb17b5adde38cf
+COMMENT
 
 make build
 

scripts/install-go.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -e
 
-GO_VERSION=1.8.3
+GO_VERSION=1.8.7
 
 sudo rm -f /usr/local/go/bin/go && sudo rm -rf /usr/local/go && sudo rm -f /bin/go
 

test-results/2018Q2-01-etcd-client-balancer/read-3M-same-keys-best-throughput.yaml

@@ -75,9 +75,9 @@ datatbase_id_to_config_client_machine_agent_control:
   etcd__v3_3:
     database_description: etcd v3.3.5 (Go 1.9.6)
     peer_ips:
-    - 10.138.0.2
-    - 10.138.0.3
-    - 10.138.0.4
+    - 10.138.0.6
+    - 10.138.0.7
+    - 10.138.0.8
     database_port_to_connect: 2379
     agent_port_to_connect: 3500
 
@@ -114,9 +114,9 @@ datatbase_id_to_config_client_machine_agent_control:
   etcd__tip:
     database_description: etcd v3.4-67b1ff672 (Go 1.10.2)
     peer_ips:
-    - 10.138.0.2
-    - 10.138.0.3
-    - 10.138.0.4
+    - 10.138.0.10
+    - 10.138.0.11
+    - 10.138.0.12
     database_port_to_connect: 2379
     agent_port_to_connect: 3500
 
@@ -153,9 +153,9 @@ datatbase_id_to_config_client_machine_agent_control:
   etcd__other:
     database_description: etcd v3.4-new-balancer (Go 1.10.2)
     peer_ips:
-    - 10.138.0.2
-    - 10.138.0.3
-    - 10.138.0.4
+    - 10.138.0.14
+    - 10.138.0.15
+    - 10.138.0.16
     database_port_to_connect: 2379
     agent_port_to_connect: 3500
 

test-results/2018Q2-01-etcd-client-balancer/write-1M-keys-best-throughput.yaml

@@ -76,9 +76,9 @@ datatbase_id_to_config_client_machine_agent_control:
   etcd__v3_3:
     database_description: etcd v3.3.5 (Go 1.9.6)
     peer_ips:
-    - 10.138.0.2
-    - 10.138.0.3
-    - 10.138.0.4
+    - 10.138.0.6
+    - 10.138.0.7
+    - 10.138.0.8
     database_port_to_connect: 2379
     agent_port_to_connect: 3500
 
@@ -116,9 +116,9 @@ datatbase_id_to_config_client_machine_agent_control:
   etcd__tip:
     database_description: etcd v3.4-67b1ff672 (Go 1.10.2)
     peer_ips:
-    - 10.138.0.2
-    - 10.138.0.3
-    - 10.138.0.4
+    - 10.138.0.10
+    - 10.138.0.11
+    - 10.138.0.12
     database_port_to_connect: 2379
     agent_port_to_connect: 3500
 
@@ -156,9 +156,9 @@ datatbase_id_to_config_client_machine_agent_control:
   etcd__other:
     database_description: etcd v3.4-new-balancer (Go 1.10.2)
     peer_ips:
-    - 10.138.0.2
-    - 10.138.0.3
-    - 10.138.0.4
+    - 10.138.0.14
+    - 10.138.0.15
+    - 10.138.0.16
     database_port_to_connect: 2379
     agent_port_to_connect: 3500