From: Patrick Donnelly <pdonnell@redhat.com>
Date: Mon, 20 Jan 2020 19:23:09 +0000 (-0800)
Subject: qa: log warning on scrub error
X-Git-Tag: v14.2.10~47^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=171e88ac7da0e999f2e94d45cb324cd408c562ac;p=ceph.git

qa: log warning on scrub error

Instead of printing the (useless) traceback, just print a warning about
ignoring the failure. The traceback makes it harder to search for the
real problem in the teuthology log.

Fixes: https://tracker.ceph.com/issues/43718
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit b7454e423620e829e7417cdfca1faf5cd91dec3f)

Conflicts:
	qa/tasks/mon_thrash.py
- whereas master has "self.manager.raw_cluster_cmd('mon', 'scrub')" in
  the try block, in nautilus it is only "self.manager.raw_cluster_cmd('scrub')"
---

diff --git a/qa/tasks/mon_thrash.py b/qa/tasks/mon_thrash.py
index 3076c936b2b4..9c18ee316724 100644
--- a/qa/tasks/mon_thrash.py
+++ b/qa/tasks/mon_thrash.py
@@ -299,8 +299,8 @@ class MonitorThrasher:
                 self.log('triggering scrub')
                 try:
                     self.manager.raw_cluster_cmd('scrub')
-                except Exception:
-                    log.exception("Saw exception while triggering scrub")
+                except Exception as e:
+                    log.warning("Ignoring exception while triggering scrub: %s", e)
 
             if self.thrash_delay > 0.0:
                 self.log('waiting for {delay} secs before continuing thrashing'.format(