diff --git a/prepare-envs.sh b/prepare-envs.sh index f7b2bb0..252f8a8 100755 --- a/prepare-envs.sh +++ b/prepare-envs.sh @@ -54,6 +54,8 @@ fi [[ ! "$INFLUX_WINDOW_INTERVAL_LONG" ]] && INFLUX_WINDOW_INTERVAL_LONG="30m" [[ ! "$ARTIFACT_BUCKET" ]] && echo no ARTIFACT_BUCKET && exit 1 [[ ! "$ENV_ARTIFACT_FILE" ]] && ENV_ARTIFACT_FILE="env-artifact.sh" +[[ ! "$CLIENT_NODE_ID_FILE" ]] && CLIENT_NODE_ID_FILE="validator_identity.json" && echo "CLIENT_NODE_ID_FILE no found , use $CLIENT_NODE_ID_FILE" +[[ ! "$CLIENT_NODE_IP_FILE" ]] && CLIENT_NODE_IP_FILE="validator_ip.txt" && echo "CLIENT_NODE_IP_FILE no found , use $CLIENT_NODE_IP_FILE" source utils.sh echo ----- stage: prepare metrics env for both query and write ------ @@ -111,4 +113,6 @@ echo "LARGE_DATA_SET=$LARGE_DATA_SET" >> env-artifact.sh echo "INFLUX_WINDOW_INTERVAL=$INFLUX_WINDOW_INTERVAL" >> env-artifact.sh echo "INFLUX_WINDOW_INTERVAL_LONG=$INFLUX_WINDOW_INTERVAL_LONG" >> env-artifact.sh echo "REPORT_BUCKET=$REPORT_BUCKET" >> env-artifact.sh +echo "CLIENT_NODE_ID_FILE=$CLIENT_NODE_ID_FILE" >> env-artifact.sh +echo "CLIENT_NODE_IP_FILE=$CLIENT_NODE_IP_FILE" >> env-artifact.sh cat dos-metrics-env.sh >> env-artifact.sh diff --git a/start-build-dependency.sh b/start-build-dependency.sh index 3ec4272..d1abace 100755 --- a/start-build-dependency.sh +++ b/start-build-dependency.sh @@ -108,4 +108,8 @@ download_file "gs://$DOS_BENCH_TPS_PRIVATE_BUCKET" "$KEYPAIR_TAR_FILE" "$HOME" tar -xzvf $KEYPAIR_TAR_FILE [[ ! -f "$HOME/keypair-configs/$KEYPAIR_FILE" ]]&&echo no "$KEYPAIR_FILE" file && exit 1 cp "$HOME/keypair-configs/$KEYPAIR_FILE" "$HOME" +download_file "gs://$DOS_BENCH_TPS_PRIVATE_BUCKET" "${CLIENT_NODE_ID_FILE}" "$HOME" +[[ ! -f "${CLIENT_NODE_ID_FILE}" ]]&& echo "no ${CLIENT_NODE_ID_FILE} found" && exit 1 +download_file "gs://$DOS_BENCH_TPS_PRIVATE_BUCKET" "${CLIENT_NODE_IP_FILE}" ./ +[[ ! -f "${CLIENT_NODE_IP_FILE}" ]]&& echo "no ${CLIENT_NODE_IP_FILE} found" && exit 1 exit 0 diff --git a/start-dos-test.sh b/start-dos-test.sh index ee9f3bb..8a75d32 100755 --- a/start-dos-test.sh +++ b/start-dos-test.sh @@ -11,13 +11,16 @@ source $HOME/env-artifact.sh [[ ! "$KEYPAIR_FILE" ]]&& KEYPAIR_FILE=large-keypairs.yaml && echo No KEYPAIR_FILE Env , use $KEYPAIR_FILE #### bench-tps ENV #### echo --- stage:setup bench-tps parameters --- +CLIENT_NODE_IP=$(cat "$HOME/${CLIENT_NODE_IP_FILE}") args=( -u "$ENDPOINT" --identity "$HOME/$ID_FILE" --read-client-keys "$HOME/$KEYPAIR_FILE" - --duration "$TX_COUNT" - --tx_count "$DURATION" + --duration "$DURATION" + --tx_count "$TX_COUNT" --thread-batch-sleep-ms "$THREAD_BATCH_SLEEP_MS" + --client-node-id "$HOME/${CLIENT_NODE_ID_FILE}" + --bind-address "${CLIENT_NODE_IP}" ) # b) use_tpu_client (boolean, if true --use-tpu-client, if false --use-rpc-client) # f) tx_count (--tx_count 10000 for the UDP test and --tx_count 2000 per client for the QUIC )