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

Colo: Prefer public IPs (#6264)

Browse Source 
automerge
This commit is contained in:
Trent Nelson 2019-10-07 21:44:57 -06:00 committed by Grimes
parent e12c577b16
commit 57916f8be6
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,7 +44,6 @@ __cloud_FindInstances() {
for AVAIL in "${COLO_RES_AVAILABILITY[@]}"; do for AVAIL in "${COLO_RES_AVAILABILITY[@]}"; do
IFS=$'\v' read -r HOST_NAME IP PRIV_IP STATUS ZONE LOCK_USER INSTNAME <<<"$AVAIL" IFS=$'\v' read -r HOST_NAME IP PRIV_IP STATUS ZONE LOCK_USER INSTNAME <<<"$AVAIL"
if [[ $INSTNAME =~ $filter ]]; then if [[ $INSTNAME =~ $filter ]]; then
IP=$PRIV_IP # Colo public IPs are firewalled to only allow UDP(8000-10000). Reuse private IP as public and require VPN
printf "%-40s | publicIp=%-16s privateIp=%s zone=%s\n" "$INSTNAME" "$IP" "$PRIV_IP" "$ZONE" 1>&2 printf "%-40s | publicIp=%-16s privateIp=%s zone=%s\n" "$INSTNAME" "$IP" "$PRIV_IP" "$ZONE" 1>&2
echo -e "${INSTNAME}:${IP}:${PRIV_IP}:$ZONE" echo -e "${INSTNAME}:${IP}:${PRIV_IP}:$ZONE"
fi fi

10
net/scripts/colo-utils.sh
View File

@ -47,9 +47,9 @@ colo_load_availability() {
COLO_RES_AVAILABILITY=() COLO_RES_AVAILABILITY=()
COLO_RES_REQUISITIONED=() COLO_RES_REQUISITIONED=()
while read -r LINE; do while read -r LINE; do
IFS=$'\v' read -r PRIV_IP STATUS LOCK_USER INSTNAME <<< "$LINE" IFS=$'\v' read -r IP STATUS LOCK_USER INSTNAME <<< "$LINE"
I=$(colo_res_index_from_ip "$PRIV_IP") I=$(colo_res_index_from_ip "$IP")
IP="${COLO_RES_IP[$I]}" PRIV_IP="${COLO_RES_IP_PRIV[$I]}"
HOST_NAME="${COLO_RES_HOSTNAME[$I]}" HOST_NAME="${COLO_RES_HOSTNAME[$I]}"
ZONE="${COLO_RES_ZONE[$I]}" ZONE="${COLO_RES_ZONE[$I]}"
COLO_RES_AVAILABILITY+=( "$(echo -e "$HOST_NAME\v$IP\v$PRIV_IP\v$STATUS\v$ZONE\v$LOCK_USER\v$INSTNAME")" ) COLO_RES_AVAILABILITY+=( "$(echo -e "$HOST_NAME\v$IP\v$PRIV_IP\v$STATUS\v$ZONE\v$LOCK_USER\v$INSTNAME")" )
@ -61,7 +61,7 @@ colo_load_availability() {
colo_res_index_from_ip() { colo_res_index_from_ip() {
declare IP="$1" declare IP="$1"
for i in "${!COLO_RES_IP_PRIV[@]}"; do for i in "${!COLO_RES_IP_PRIV[@]}"; do
if [ "$IP" = "${COLO_RES_IP_PRIV[$i]}" ]; then if [[ "$IP" = "${COLO_RES_IP[$i]}" || "$IP" = "${COLO_RES_IP_PRIV[$i]}" ]]; then
echo "$i" echo "$i"
return 0 return 0
fi fi
@ -89,7 +89,7 @@ colo_instance_run_foreach() {
CMD="$1" CMD="$1"
declare IPS=() declare IPS=()
for I in $(seq 0 $((COLO_RES_N-1))); do for I in $(seq 0 $((COLO_RES_N-1))); do
IPS+=( "${COLO_RES_IP_PRIV[$I]}" ) IPS+=( "${COLO_RES_IP[$I]}" )
done done
set "${IPS[@]}" "$CMD" set "${IPS[@]}" "$CMD"
fi fi