From: Nitzan Mordechai <nmordech@redhat.com>
Date: Wed, 26 Jun 2024 13:04:45 +0000 (+0000)
Subject: qa/tasks: watchdog terminate thrasher
X-Git-Tag: testing/56408~60^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4d69523d6bccb896a5fbdc467a6035076ebc7772;p=ceph-ci.git

qa/tasks: watchdog terminate thrasher

If a thrasher exception occurs, the do_dump_ops thread will continue
looping until the Teuthology timeout is reached.
The watchdog should terminate the thrasher to free up resources.

Fixes: https://tracker.ceph.com/issues/66698
Signed-off-by: Nitzan Mordechai <nmordech@redhat.com>
(cherry picked from commit 21b4b89e5280cfd87f4419b4c1dcc01673835e04)
---

diff --git a/qa/tasks/daemonwatchdog.py b/qa/tasks/daemonwatchdog.py
index c8fa9f3c26f..ceffd56ebb1 100644
--- a/qa/tasks/daemonwatchdog.py
+++ b/qa/tasks/daemonwatchdog.py
@@ -117,6 +117,7 @@ class DaemonWatchdog(Greenlet):
             for thrasher in self.thrashers:
                 if thrasher.exception is not None:
                     self.log("{name} failed".format(name=thrasher.name))
+                    thrasher.stop_and_join()
                     bark = True
 
             if bark: