Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(s2n-quic-qns): use updated docker compose #2295

Merged
merged 1 commit into from
Aug 6, 2024
Merged

chore(s2n-quic-qns): use updated docker compose #2295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions scripts/benchmark/run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ function ensure_executable() {
fi
}

ensure_executable "docker-compose"
ensure_executable "docker compose"
ensure_executable "tshark"
ensure_executable "gnuplot"

Expand Down Expand Up @@ -64,7 +64,7 @@ DOWNLOAD_B=$(($DOWNLOAD_MB * 1000000)) \
UPLOAD_B=$(($UPLOAD_MB * 1000000)) \
DURATION="$DURATION" \
SCENARIO="$SCENARIO" \
docker-compose --file quic/s2n-quic-qns/benchmark/docker-compose.yml up --abort-on-container-exit --timeout 1 sim client server
docker compose --file quic/s2n-quic-qns/benchmark/docker-compose.yml up --abort-on-container-exit --timeout 1 sim client server

tshark -r "$LOG_DIR/$CLIENT_PCAP" -t u -qz io,stat,1,"SUM(ip.len)"ip.len\&\&ip.dst==193.167.0.100 | awk -F '[\\|\s]' '{ print $2 $3}' > "${TMP}/s2n-quic.nsv"
# Find the time of the first real data transfer packet
Expand All @@ -88,7 +88,7 @@ if [ "$COMPARE_TO_MAIN" = true ] ; then
UPLOAD_B=$(($UPLOAD_MB * 1000000)) \
DURATION="$DURATION" \
SCENARIO="$SCENARIO" \
docker-compose --file quic/s2n-quic-qns/benchmark/docker-compose.yml up --abort-on-container-exit --timeout 1 sim client server-main
docker compose --file quic/s2n-quic-qns/benchmark/docker-compose.yml up --abort-on-container-exit --timeout 1 sim client server-main

tshark -r "$LOG_DIR/$CLIENT_PCAP" -t u -qz io,stat,1,"SUM(ip.len)"ip.len\&\&ip.dst==193.167.0.100 | awk -F '[\\|\s]' '{ print $2 $3}' > "${TMP}/s2n-quic-main.nsv"
# Find the time of the first real data transfer packet
Expand Down Expand Up @@ -117,7 +117,7 @@ do
LOG_DIR="$LOG_DIR" \
SCENARIO="$SCENARIO" \
DURATION="$DURATION" \
docker-compose --file quic/s2n-quic-qns/benchmark/docker-compose.yml up --abort-on-container-exit --timeout 1 --exit-code-from iperf_client sim iperf_client iperf_server && break
docker compose --file quic/s2n-quic-qns/benchmark/docker-compose.yml up --abort-on-container-exit --timeout 1 --exit-code-from iperf_client sim iperf_client iperf_server && break
ATTEMPTS=$((ATTEMPTS+1))
done

Expand Down
2 changes: 1 addition & 1 deletion scripts/interop/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Requirements

* docker-compose
* docker compose
* tshark

## Pulling the latest images
Expand Down
2 changes: 1 addition & 1 deletion scripts/interop/run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ function ensure_executable() {
fi
}

ensure_executable "docker-compose"
ensure_executable "docker compose"
ensure_executable "tshark"

case "$(uname -s)" in
Expand Down
Loading