Commit becf970e authored by Jim Newsome's avatar Jim Newsome
Browse files

Remove broken syslog compression. Try a 20m sim.

parent 716b03d8
......@@ -187,7 +187,7 @@ run-sim:
PROCESS_SCALE: '0.01'
TMODEL_REPO: 'https://github.com/tmodel-ccs2018/tmodel-ccs2018.github.io.git'
TMODEL_BRANCH: master
SIM_TIME: '60m'
SIM_TIME: '15m'
stage: simulate
needs:
- build-oniontrace
......@@ -209,12 +209,6 @@ run-sim:
- pip3 install -I jobs/src/tornettools
- tornettools generate jobs/network-data/relayinfo_staging_*.json jobs/network-data/userinfo_staging_*.json jobs/src/tmodel --network_scale $SCALE --prefix jobs/tornet --tor jobs/opt/tor/bin/tor --torgencert jobs/opt/tor/bin/tor-gencert --process_scale $PROCESS_SCALE
# Set up a "syslog" to collect trace data, and compress it on the fly.
# We'll need to explicitly kill the `nc` job later to ensure xz flushes its
# buffers.
- apt-get install -y netcat xz-utils
- ( nc -lkU /dev/log & echo $! > nc.pid ) | grep " Tor" | xz -2 - > jobs/tornet/tor-trace.txt.xz &
# Run simulation
- apt-get install -y libevent-2.1-7 libssl1.1 zlib1g libglib2.0-0 libigraph0v5 libprocps8 stow sysstat python3 python3-pip
- pip3 install -r jobs/src/tornettools/requirements.txt
......@@ -225,7 +219,7 @@ run-sim:
- stow -d jobs/opt -t $HOME/.local tor
# TODO: Collect trace data from more tor instances; working on space issues.
# https://gitlab.torproject.org/jnewsome/sponsor-61-sims/-/issues/4
- echo "Log [sim]debug syslog" >> jobs/tornet/conf/tor.relay.exitonly.torrc
- echo "Log [sim]debug file jobs/tornet/tor-trace.txt" >> jobs/tornet/conf/tor.relay.exitonly.torrc
# Record all warnings and errors
- echo "Log warn-warn file $CI_PROJECT_DIR/jobs/tornet/tor-warn.txt" >> jobs/tornet/conf/tor.common.torrc
......@@ -255,9 +249,6 @@ run-sim:
- PARALLELISM=10
- tornettools simulate -s $CI_PROJECT_DIR/jobs/opt/shadow/bin/shadow -a "--use-cpu-pinning=true --interpose-method=preload -p $PARALLELISM --template-directory=shadow.data.template" $CI_PROJECT_DIR/jobs/tornet
# Kill our "syslog" process
- kill `cat nc.pid`
# Parse simulation results.
# The raw results are too large to save as an artifact.
# Parse the logs and save the results of that.
......@@ -277,7 +268,7 @@ run-sim:
- 'jobs/tornet/**/*.json.xz'
- 'jobs/tornet/**/*.json'
- jobs/tornet/shadow.log.warn
- jobs/tornet/tor-trace.txt.xz
- jobs/tornet/tor-trace.txt
- jobs/tornet/tor-warn.txt
- jobs/tornet/tor-err.txt
- jobs/tornet/sysinfo
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment