From: Xiubo Li <xiubli@redhat.com>
Date: Thu, 6 Apr 2023 02:17:44 +0000 (+0800)
Subject: qa/workunit: print the detail commands excuted in the scripts
X-Git-Tag: v19.0.0~1383^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F50909%2Fhead;p=ceph.git

qa/workunit: print the detail commands excuted in the scripts

This will make it to be much easier when debugging the qa tests failures.

Signed-off-by: Xiubo Li <xiubli@redhat.com>
---

diff --git a/qa/workunits/fs/full/subvolume_clone.sh b/qa/workunits/fs/full/subvolume_clone.sh
index a11131215b41..75648f306f8b 100755
--- a/qa/workunits/fs/full/subvolume_clone.sh
+++ b/qa/workunits/fs/full/subvolume_clone.sh
@@ -19,7 +19,6 @@ set -ex
 # Note that the failed clones would be in retry loop and it's state would be 'pending' or 'in-progress'.
 # It's state is not updated to 'failed' as the config update to gets ENOSPACE too.
 
-set -e
 ignore_failure() {
         if "$@"; then return 0; else return 0; fi
 }
diff --git a/qa/workunits/fs/snaps/snaptest-parents.sh b/qa/workunits/fs/snaps/snaptest-parents.sh
index 7ab1ba7cf2d1..3d5373847b23 100755
--- a/qa/workunits/fs/snaps/snaptest-parents.sh
+++ b/qa/workunits/fs/snaps/snaptest-parents.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-set -e
+set -ex
 
 echo "making directory tree and files"
 mkdir -p 1/a/b/c/
diff --git a/qa/workunits/fs/snaps/untar_snap_rm.sh b/qa/workunits/fs/snaps/untar_snap_rm.sh
index 8a8412e66592..a02db572a8fd 100755
--- a/qa/workunits/fs/snaps/untar_snap_rm.sh
+++ b/qa/workunits/fs/snaps/untar_snap_rm.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-set -e
+set -ex
 
 do_tarball() {
     wget http://download.ceph.com/qa/$1
diff --git a/qa/workunits/hadoop/wordcount.sh b/qa/workunits/hadoop/wordcount.sh
index 616b08af20a0..fb6b1252aa15 100755
--- a/qa/workunits/hadoop/wordcount.sh
+++ b/qa/workunits/hadoop/wordcount.sh
@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 
-set -e
-set -x
+set -ex
 
 WC_INPUT=/wc_input
 WC_OUTPUT=/wc_output
diff --git a/qa/workunits/kernel_untar_build.sh b/qa/workunits/kernel_untar_build.sh
index 9b60f065c8d8..9ee55eac9924 100755
--- a/qa/workunits/kernel_untar_build.sh
+++ b/qa/workunits/kernel_untar_build.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -e
+set -ex
 
 wget -O linux.tar.gz http://download.ceph.com/qa/linux-5.4.tar.gz
 
diff --git a/qa/workunits/suites/blogbench.sh b/qa/workunits/suites/blogbench.sh
index a05d8d21ceaf..ac76349fd8be 100755
--- a/qa/workunits/suites/blogbench.sh
+++ b/qa/workunits/suites/blogbench.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -e
+set -ex
 
 echo "getting blogbench"
 wget http://download.ceph.com/qa/blogbench-1.0.tar.bz2
diff --git a/qa/workunits/suites/bonnie.sh b/qa/workunits/suites/bonnie.sh
index b60cc6a5e8ec..6c93f9564041 100755
--- a/qa/workunits/suites/bonnie.sh
+++ b/qa/workunits/suites/bonnie.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -e
+set -ex
 
 bonnie_bin=`which bonnie++`
 [ $? -eq 1 ] && bonnie_bin=/usr/sbin/bonnie++
diff --git a/qa/workunits/suites/cephfs_journal_tool_smoke.sh b/qa/workunits/suites/cephfs_journal_tool_smoke.sh
index 3fe01ed63f19..a24dac532d5a 100755
--- a/qa/workunits/suites/cephfs_journal_tool_smoke.sh
+++ b/qa/workunits/suites/cephfs_journal_tool_smoke.sh
@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 
-set -e
-set -x
+set -ex
 
 export BIN="${BIN:-cephfs-journal-tool --rank=cephfs:0}"
 export JOURNAL_FILE=/tmp/journal.bin
diff --git a/qa/workunits/suites/dbench-short.sh b/qa/workunits/suites/dbench-short.sh
index b0da02275766..e76237914ada 100755
--- a/qa/workunits/suites/dbench-short.sh
+++ b/qa/workunits/suites/dbench-short.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
-set -e
+set -ex
 
 dbench 1
diff --git a/qa/workunits/suites/dbench.sh b/qa/workunits/suites/dbench.sh
index 32c893b453f4..61c4f0018063 100755
--- a/qa/workunits/suites/dbench.sh
+++ b/qa/workunits/suites/dbench.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -e
+set -ex
 
 dbench 1
 dbench 10
diff --git a/qa/workunits/suites/ffsb.sh b/qa/workunits/suites/ffsb.sh
index bf95a05c4e83..41bbb31333ac 100755
--- a/qa/workunits/suites/ffsb.sh
+++ b/qa/workunits/suites/ffsb.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -e
+set -ex
 
 mydir=`dirname $0`
 
diff --git a/qa/workunits/suites/fsync-tester.sh b/qa/workunits/suites/fsync-tester.sh
index 6e32786ea957..6f1fc4111c1a 100755
--- a/qa/workunits/suites/fsync-tester.sh
+++ b/qa/workunits/suites/fsync-tester.sh
@@ -1,6 +1,6 @@
-#!/bin/sh -x
+#!/bin/sh
 
-set -e
+set -ex
 
 # To skirt around GPL compatibility issues:
 wget http://download.ceph.com/qa/fsync-tester.c
diff --git a/qa/workunits/suites/iogen.sh b/qa/workunits/suites/iogen.sh
index d92b8708355a..3583438f069b 100755
--- a/qa/workunits/suites/iogen.sh
+++ b/qa/workunits/suites/iogen.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -e
+set -ex
 
 echo "getting iogen"
 wget http://download.ceph.com/qa/iogen_3.1p0.tar
diff --git a/qa/workunits/suites/iozone-sync.sh b/qa/workunits/suites/iozone-sync.sh
index a37962d308ee..449de21a4dd1 100755
--- a/qa/workunits/suites/iozone-sync.sh
+++ b/qa/workunits/suites/iozone-sync.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -e
+set -ex
 
 # basic tests of O_SYNC, O_DSYNC, O_RSYNC
 # test O_SYNC
diff --git a/qa/workunits/suites/pjd.sh b/qa/workunits/suites/pjd.sh
index bd72f77f2c97..5c22b4af78cf 100755
--- a/qa/workunits/suites/pjd.sh
+++ b/qa/workunits/suites/pjd.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -e
+set -ex
 
 wget http://download.ceph.com/qa/pjd-fstest-20090130-RC-aclfixes.tgz
 tar zxvf pjd*.tgz
diff --git a/qa/workunits/true.sh b/qa/workunits/true.sh
index 296ef781c6f0..aa153ae43966 100755
--- a/qa/workunits/true.sh
+++ b/qa/workunits/true.sh
@@ -1,3 +1,3 @@
-#!/bin/sh
+#!/bin/sh -ex
 
 true