Skip to content

Commit 58dfca4

Browse files
leftwoAlan Hanson
and
Alan Hanson
authoredJul 22, 2024··
Add timeouts to test-up buildomat tests (#1389)
This should give us a 2 hour time out for the `test_up` tests, and log files to go with it. Co-authored-by: Alan Hanson <alan@oxide.computer>
1 parent e58ca36 commit 58dfca4

File tree

2 files changed

+36
-6
lines changed

2 files changed

+36
-6
lines changed
 

‎.github/buildomat/jobs/test-up-encrypted.sh

+18-3
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
#: variety = "basic"
55
#: target = "helios-2.0"
66
#: output_rules = [
7-
#: "/tmp/test_up/*.txt",
8-
#: "/tmp/test_up/dsc/*.txt",
7+
#: "%/tmp/test_up/*.txt",
8+
#: "%/tmp/test_up/dsc/*.txt",
9+
#: "%/tmp/debug/*",
910
#: "/tmp/core.*",
1011
#: ]
1112
#: skip_clone = true
@@ -41,7 +42,21 @@ done
4142

4243
export BINDIR=/var/tmp/bins
4344

45+
# Give this test two hours to finish
46+
jobpid=$$; (sleep $(( 120 * 60 )); banner fail-timeout; ps -ef; zfs list;kill $jobpid) &
47+
48+
echo "Setup debug logging"
49+
mkdir /tmp/debug
50+
psrinfo -v > /tmp/debug/psrinfo.txt
51+
df -h > /tmp/debug/df.txt || true
52+
prstat -d d -mLc 1 > /tmp/debug/prstat.txt 2>&1 &
53+
iostat -T d -xn 1 > /tmp/debug/iostat.txt 2>&1 &
54+
mpstat -T d 1 > /tmp/debug/mpstat.txt 2>&1 &
55+
vmstat -T d -p 1 < /dev/null > /tmp/debug/paging.txt 2>&1 &
56+
pfexec dtrace -Z -s $input/scripts/perf-downstairs-tick.d > /tmp/debug/dtrace.txt 2>&1 &
57+
pfexec dtrace -Z -s $input/scripts/upstairs_info.d > /tmp/debug/upstairs-info.txt 2>&1 &
58+
4459
banner test_up_encrypted
4560
ptime -m bash "$input/scripts/test_up.sh" -N encrypted
4661

47-
# Save the output files?
62+
echo "test-up-encrypted ends"

‎.github/buildomat/jobs/test-up-unencrypted.sh

+18-3
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
#: variety = "basic"
55
#: target = "helios-2.0"
66
#: output_rules = [
7-
#: "/tmp/test_up/*.txt",
8-
#: "/tmp/test_up/dsc/*.txt",
7+
#: "%/tmp/test_up/*.txt",
8+
#: "%/tmp/test_up/dsc/*.txt",
9+
#: "%/tmp/debug/*",
910
#: "/tmp/core.*",
1011
#: ]
1112
#: skip_clone = true
@@ -41,7 +42,21 @@ done
4142

4243
export BINDIR=/var/tmp/bins
4344

45+
# Give this test two hours to finish
46+
jobpid=$$; (sleep $(( 120 * 60 )); banner fail-timeout; ps -ef; zfs list;kill $jobpid) &
47+
48+
echo "Setup debug logging"
49+
mkdir /tmp/debug
50+
psrinfo -v > /tmp/debug/psrinfo.txt
51+
df -h > /tmp/debug/df.txt || true
52+
prstat -d d -mLc 1 > /tmp/debug/prstat.txt 2>&1 &
53+
iostat -T d -xn 1 > /tmp/debug/iostat.txt 2>&1 &
54+
mpstat -T d 1 > /tmp/debug/mpstat.txt 2>&1 &
55+
vmstat -T d -p 1 < /dev/null > /tmp/debug/paging.txt 2>&1 &
56+
pfexec dtrace -Z -s $input/scripts/perf-downstairs-tick.d > /tmp/debug/dtrace.txt 2>&1 &
57+
pfexec dtrace -Z -s $input/scripts/upstairs_info.d > /tmp/debug/upstairs-info.txt 2>&1 &
58+
4459
banner test_up_unencrypted
4560
ptime -m bash "$input/scripts/test_up.sh" -N unencrypted
4661

47-
# Save the output files?
62+
echo "test-up-unencrypted ends"

0 commit comments

Comments
 (0)
Please sign in to comment.