Add debug logs to ztest (#127)

Save debugging information automatically collected from the last three core dumps generated by ztest. This change does not modify the existing behavior when those log files are missing. Requires openzfs/zfs#6999. Signed-off-by: Brian Behlendorf <[email protected]>
openzfs · Jan 25, 2018 · 3656882 · 3656882
1 parent ce72636
commit 3656882
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/master/master.cfg b/master/master.cfg
@@ -371,8 +371,22 @@ test_factory.addStep(ShellCommand(
     command=["runurl", bb_url + "bb-test-ztest.sh"],
     haltOnFailure=False, maxTime=14400, sigtermTime=30, logEnviron=False,
     lazylogfiles=True,
-    logfiles={"ztest.out" : { "filename" : "ztest.out", "follow" : False },
-              "console" : { "filename" : "console.log", "follow" : False }},
+    logfiles={"ztest.out" : { "filename" : "ztest.out" },
+              "ztest.history" : { "filename" : "ztest.history" },
+              "ztest.cores" : { "filename" : "ztest.cores" },
+              "1/ztest.out" : { "filename" : "ztest.core.1/ztest.out" },
+              "1/ztest.history" : { "filename" : "ztest.core.1/ztest.history" },
+              "1/ztest.zdb" : { "filename" : "ztest.core.1/ztest.zdb" },
+              "1/ztest.gdb" : { "filename" : "ztest.core.1/ztest.gdb" },
+              "2/ztest.out" : { "filename" : "ztest.core.2/ztest.out" },
+              "2/ztest.history" : { "filename" : "ztest.core.2/ztest.history" },
+              "2/ztest.zdb" : { "filename" : "ztest.core.2/ztest.zdb" },
+              "2/ztest.gdb" : { "filename" : "ztest.core.2/ztest.gdb" },
+              "3/ztest.out" : { "filename" : "ztest.core.3/ztest.out" },
+              "3/ztest.history" : { "filename" : "ztest.core.3/ztest.history" },
+              "3/ztest.zdb" : { "filename" : "ztest.core.3/ztest.zdb" },
+              "3/ztest.gdb" : { "filename" : "ztest.core.3/ztest.gdb" },
+              "console" : { "filename" : "console.log"}},
     decodeRC={0 : SUCCESS, 1 : FAILURE, 2 : WARNINGS, 3 : SKIPPED },
     description=["ztest"], descriptionDone=["ztest"],
     hideStepIf=lambda results, s: results==SKIPPED))

diff --git a/scripts/bb-test-ztest.sh b/scripts/bb-test-ztest.sh
@@ -28,6 +28,7 @@ trap cleanup EXIT TERM
 
 set -x
 
+TEST_ZTEST_OPTIONS=${TEST_ZTEST_OPTIONS:-"-l -m3"}
 TEST_ZTEST_TIMEOUT=${TEST_ZTEST_TIMEOUT:-900}
 TEST_ZTEST_DIR=${TEST_ZTEST_DIR:-"/mnt"}
 TEST_ZTEST_CORE_DIR=${TEST_ZTEST_CORE_DIR:-"/mnt/zloop"}