s/_/-/g in filenames

This commit is contained in:
Michael Vines 2018-09-04 14:36:35 -07:00
parent bcaa0fdcb1
commit 6ad4a81123
6 changed files with 9 additions and 9 deletions

View File

@ -182,12 +182,12 @@ create)
echo ================================================================== echo ==================================================================
echo echo
gcloud_CreateInstances "$prefix-leader" 1 \ gcloud_CreateInstances "$prefix-leader" 1 \
"$zone" "$imageName" "$leaderMachineType" "$leaderAccelerator" "$here/remote/remote_startup.sh" "$zone" "$imageName" "$leaderMachineType" "$leaderAccelerator" "$here/remote/remote-startup.sh"
gcloud_CreateInstances "$prefix-validator" "$validatorNodeCount" \ gcloud_CreateInstances "$prefix-validator" "$validatorNodeCount" \
"$zone" "$imageName" "$validatorMachineType" "$validatorAccelerator" "$here/remote/remote_startup.sh" "$zone" "$imageName" "$validatorMachineType" "$validatorAccelerator" "$here/remote/remote-startup.sh"
if [[ -n $clientNodeCount ]]; then if [[ -n $clientNodeCount ]]; then
gcloud_CreateInstances "$prefix-client" "$clientNodeCount" \ gcloud_CreateInstances "$prefix-client" "$clientNodeCount" \
"$zone" "$imageName" "$clientMachineType" "$clientAccelerator" "$here/remote/remote_startup.sh" "$zone" "$imageName" "$clientMachineType" "$clientAccelerator" "$here/remote/remote-startup.sh"
fi fi
prepareInstancesAndWriteConfigFile prepareInstancesAndWriteConfigFile

View File

@ -150,7 +150,7 @@ startLeader() {
esac esac
ssh "${sshOptions[@]}" -n "$ipAddress" \ ssh "${sshOptions[@]}" -n "$ipAddress" \
"./solana/net/remote/remote_node.sh $deployMethod leader $leaderIp $expectedNodeCount \"$nodeSetupArgs\" \"$RUST_LOG\"" "./solana/net/remote/remote-node.sh $deployMethod leader $leaderIp $expectedNodeCount \"$nodeSetupArgs\" \"$RUST_LOG\""
) >> "$logFile" 2>&1 ) >> "$logFile" 2>&1
} }
@ -163,7 +163,7 @@ startValidator() {
common_start_setup "$ipAddress" /dev/stdout common_start_setup "$ipAddress" /dev/stdout
set -x set -x
ssh "${sshOptions[@]}" -n "$ipAddress" \ ssh "${sshOptions[@]}" -n "$ipAddress" \
"./solana/net/remote/remote_node.sh $deployMethod validator $leaderIp $expectedNodeCount \"$nodeSetupArgs\" \"$RUST_LOG\"" "./solana/net/remote/remote-node.sh $deployMethod validator $leaderIp $expectedNodeCount \"$nodeSetupArgs\" \"$RUST_LOG\""
) >> "$netLogDir/validator-$ipAddress.log" 2>&1 & ) >> "$netLogDir/validator-$ipAddress.log" 2>&1 &
declare pid=$! declare pid=$!
ln -sfT "validator-$ipAddress.log" "$netLogDir/validator-$pid.log" ln -sfT "validator-$ipAddress.log" "$netLogDir/validator-$pid.log"
@ -179,7 +179,7 @@ startClient() {
( (
set -x set -x
ssh "${sshOptions[@]}" -f "$ipAddress" \ ssh "${sshOptions[@]}" -f "$ipAddress" \
"./solana/net/remote/remote_client.sh $deployMethod $leaderIp $expectedNodeCount \"$RUST_LOG\"" "./solana/net/remote/remote-client.sh $deployMethod $leaderIp $expectedNodeCount \"$RUST_LOG\""
) >> "$logFile" 2>&1 ) >> "$logFile" 2>&1
} }
@ -188,9 +188,9 @@ sanity() {
echo "--- Sanity" echo "--- Sanity"
( (
set -x set -x
# shellcheck disable=SC2029 # remote_client.sh args are expanded on client side intentionally # shellcheck disable=SC2029 # remote-client.sh args are expanded on client side intentionally
ssh "${sshOptions[@]}" "$leaderIp" \ ssh "${sshOptions[@]}" "$leaderIp" \
"./solana/net/remote/remote_sanity.sh $sanityExtraArgs" "./solana/net/remote/remote-sanity.sh $sanityExtraArgs"
) )
} }
@ -293,7 +293,7 @@ stop_node() {
sudo snap set solana mode=; sudo snap set solana mode=;
sudo snap remove solana; sudo snap remove solana;
fi; fi;
for pattern in solana- remote_ oom-monitor; do pkill -9 \$pattern; done; for pattern in solana- remote- oom-monitor; do pkill -9 \$pattern; done;
" "
) || true ) || true
} }