gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Colo: Prefer public IPs, part 2 (#6297)

Browse Source 
automerge
This commit is contained in:
Trent Nelson
2019-10-09 16:17:24 -06:00
committed by Grimes
parent fdaee4ab17
commit 4713cb8675
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
net/scripts/colo-provider.sh
View File

@ -204,7 +204,7 @@ cloud_CreateInstances() {
while [[ $NI -lt $numNodes && $RI -lt $COLO_RES_N ]]; do while [[ $NI -lt $numNodes && $RI -lt $COLO_RES_N ]]; do
node="${nodes[$NI]}" node="${nodes[$NI]}"
RES_MACH="${COLO_RES_MACHINE[$RI]}" RES_MACH="${COLO_RES_MACHINE[$RI]}"
IP="${COLO_RES_IP_PRIV[$RI]}" IP="${COLO_RES_IP[$RI]}"
if colo_machine_types_compatible "$RES_MACH" "$machineType"; then if colo_machine_types_compatible "$RES_MACH" "$machineType"; then
if colo_node_requisition "$IP" "$node" "$sshPrivateKey" >/dev/null; then if colo_node_requisition "$IP" "$node" "$sshPrivateKey" >/dev/null; then
NI=$((NI+1)) NI=$((NI+1))
@ -235,10 +235,10 @@ cloud_DeleteInstances() {
# #
cloud_WaitForInstanceReady() { cloud_WaitForInstanceReady() {
#declare instanceName="$1" # unused #declare instanceName="$1" # unused
declare instanceIp="$2" #declare instanceIp="$2" # unused
declare timeout="$4" #declare timeout="$4" # unused
timeout "${timeout}"s bash -c "set -o pipefail; until ping -c 3 $instanceIp | tr - _; do echo .; done" true
} }
# #