From 83ada274a2b8750d0a0ac10018c0fc4769434590 Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@redhat.com>
Date: Wed, 21 Jul 2021 14:56:42 -0600
Subject: [PATCH] Fix dstat options

--top-io-adv and --top-cpu-adv aren't options in c8, so let's make their
usage dynamic

Change-Id: I1fc97d77311763d972b2da925f87d09caa9b21ee
(cherry picked from commit 47e61125708a3bbbb1bc665bda61cede3b9ae910)
(cherry picked from commit 3c099fabfb22d6ac1ff73798500137dd68ceae4d)
(cherry picked from commit 34e792182f895fb145af6974d62b161e4bc0321d)
(cherry picked from commit d098b4f9e601d63b349dccad77e6747a03bf6a12)
---
 run_tests.sh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/run_tests.sh b/run_tests.sh
index 90a42b66c..904d1c83e 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -162,7 +162,17 @@ fi
 # use dstat to monitor system activity during integration testing
 if type "dstat" 2>/dev/null; then
     print_header 'Start dstat'
-    $SUDO dstat -tcmndrylpg --top-cpu-adv --top-io-adv --nocolor | $SUDO tee --append /var/log/dstat.log > /dev/null &
+    DSTAT_OPTS=""
+    set -e
+    if dstat --help 2>&1 | grep -q "top-io-adv"; then
+        DSTAT_OPTS="${DSTAT_OPTS} --top-io-adv"
+    fi
+
+    if dstat --help 2>&1 | grep -q "top-cpu-adv"; then
+        DSTAT_OPTS="${DSTAT_OPTS} --top-cpu-adv"
+    fi
+    set +e
+    $SUDO dstat -tcmndrylpg $DSTAT_OPTS --nocolor | $SUDO tee --append /var/log/dstat.log > /dev/null &
 fi
 
 if type "iostat" 2>/dev/null; then