summaryrefslogtreecommitdiffstats
path: root/modules-available/vmstore
diff options
context:
space:
mode:
authorSimon Rettberg2022-07-06 16:21:08 +0200
committerSimon Rettberg2022-07-06 16:21:08 +0200
commit740700539533004a7e8faedc6c9a49beebb8a0b4 (patch)
treee48758ab3c078b4007a87a56624c19cf6acc49c0 /modules-available/vmstore
parent[vmstore] Fix NFS speed test (diff)
downloadslx-admin-740700539533004a7e8faedc6c9a49beebb8a0b4.tar.gz
slx-admin-740700539533004a7e8faedc6c9a49beebb8a0b4.tar.xz
slx-admin-740700539533004a7e8faedc6c9a49beebb8a0b4.zip
[vmstore] Benchmark: Print all output in timeout
Diffstat (limited to 'modules-available/vmstore')
-rw-r--r--modules-available/vmstore/page.inc.php9
1 files changed, 8 insertions, 1 deletions
diff --git a/modules-available/vmstore/page.inc.php b/modules-available/vmstore/page.inc.php
index bd43cb54..8d8a2461 100644
--- a/modules-available/vmstore/page.inc.php
+++ b/modules-available/vmstore/page.inc.php
@@ -263,9 +263,16 @@ class Page_VmStore extends Page
if (empty($active)) {
$timeout = true;
} else {
- $command = <<<EOF
+ if ($timeout) {
+ // cat everything for easier troubleshooting
+ $command = <<<EOF
+cat "/tmp/speedcheck-$id"
+EOF;
+ } else {
+ $command = <<<EOF
grep -q '^Seq:' "/tmp/speedcheck-$id" && cat "/tmp/speedcheck-$id"
EOF;
+ }
$task = RebootControl::runScript($active, $command);
$task = Taskmanager::waitComplete($task, 4000);
if ($task === false) {