Configure boot disk size

net/gce.sh

@@ -9,11 +9,14 @@ source "$here"/common.sh
 prefix=testnet-dev-${USER//[^A-Za-z0-9]/}
 validatorNodeCount=5
 clientNodeCount=1
+leaderBootDiskSize=1TB
 leaderMachineType=n1-standard-16
 leaderAccelerator=
 validatorMachineType=n1-standard-4
+validatorBootDiskSize=$leaderBootDiskSize
 validatorAccelerator=
 clientMachineType=n1-standard-16
+clientBootDiskSize=40GB
 clientAccelerator=
 
 imageName="ubuntu-16-04-cuda-9-2-new"
@@ -107,6 +110,7 @@ done
 
 
 prepareInstancesAndWriteConfigFile() {
+  $metricsWriteDatapoint "testnet-deploy net-config-start=1"
 
   cat >> "$configFile" <<EOF
 # autogenerated at $(date)
@@ -174,10 +178,13 @@ EOF
   }
 
   echo "Wrote $configFile"
+  $metricsWriteDatapoint "testnet-deploy net-config-complete=1"
 }
 
 case $command in
 delete)
+  $metricsWriteDatapoint "testnet-deploy net-delete-start=1"
+
   gcloud_FindInstances "name~^$prefix-"
 
   if [[ ${#instances[@]} -eq 0 ]]; then
@@ -186,11 +193,15 @@ delete)
   fi
   gcloud_DeleteInstances "$yes"
   rm -f "$configFile"
+
+  $metricsWriteDatapoint "testnet-deploy net-delete-complete=1"
   ;;
 
 create)
   [[ -n $validatorNodeCount ]] || usage "Need number of nodes"
 
+  $metricsWriteDatapoint "testnet-deploy net-create=1"
+
   echo "Network composition:"
   echo "Leader = $leaderMachineType (GPU=${leaderAccelerator:-none})"
   echo "Validators = $validatorNodeCount x $validatorMachineType (GPU=${validatorAccelerator:-none})"
@@ -198,18 +209,20 @@ create)
   echo ==================================================================
   echo
   gcloud_CreateInstances "$prefix-leader" 1 "$zone" \
-    "$imageName" "$leaderMachineType" "$leaderAccelerator" \
+    "$imageName" "$leaderMachineType" "$leaderBootDiskSize" "$leaderAccelerator" \
     "$here/remote/remote-startup.sh" "$leaderAddress" \
 
   gcloud_CreateInstances "$prefix-validator" "$validatorNodeCount" "$zone" \
-    "$imageName" "$validatorMachineType" "$validatorAccelerator" \
+    "$imageName" "$validatorMachineType" "$validatorBootDiskSize" "$validatorAccelerator" \
     "$here/remote/remote-startup.sh" ""
   if [[ -n $clientNodeCount ]]; then
     gcloud_CreateInstances "$prefix-client" "$clientNodeCount" "$zone" \
-      "$imageName" "$clientMachineType" "$clientAccelerator" \
+      "$imageName" "$clientMachineType" "$clientBootDiskSize" "$clientAccelerator" \
       "$here/remote/remote-startup.sh" ""
   fi
 
+  $metricsWriteDatapoint "testnet-deploy net-create-complete=1"
+
   prepareInstancesAndWriteConfigFile
   ;;