From: Sage Weil <sage@redhat.com>
Date: Wed, 3 Jan 2018 14:37:02 +0000 (-0600)
Subject: qa/tasks/ceph_manager: tolerate failure to force backfill/recoery
X-Git-Tag: v12.2.3~39^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=adc47b95958b96322a649e6e2f5d6d4e2d58701e;p=ceph.git

qa/tasks/ceph_manager: tolerate failure to force backfill/recoery

The pool may have been deleted out from underneath us.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 8651e15c93ce419529b82c4c19feef1ab2b647c8)
---

diff --git a/qa/tasks/ceph_manager.py b/qa/tasks/ceph_manager.py
index 5a89f235f2d..edbb2ae3ec6 100644
--- a/qa/tasks/ceph_manager.py
+++ b/qa/tasks/ceph_manager.py
@@ -612,10 +612,14 @@ class Thrasher:
         backfill = random.random() >= 0.5
         j = self.ceph_manager.get_pgids_to_force(backfill)
         if j:
-            if backfill:
-                self.ceph_manager.raw_cluster_cmd('pg', 'force-backfill', *j)
-            else:
-                self.ceph_manager.raw_cluster_cmd('pg', 'force-recovery', *j)
+            try:
+                if backfill:
+                    self.ceph_manager.raw_cluster_cmd('pg', 'force-backfill', *j)
+                else:
+                    self.ceph_manager.raw_cluster_cmd('pg', 'force-recovery', *j)
+            except CommandFailedError:
+                self.log('Failed to force backfill|recovery, ignoring')
+
 
     def cancel_force_recovery(self):
         """
@@ -624,10 +628,13 @@ class Thrasher:
         backfill = random.random() >= 0.5
         j = self.ceph_manager.get_pgids_to_cancel_force(backfill)
         if j:
-            if backfill:
-                self.ceph_manager.raw_cluster_cmd('pg', 'cancel-force-backfill', *j)
-            else:
-                self.ceph_manager.raw_cluster_cmd('pg', 'cancel-force-recovery', *j)
+            try:
+                if backfill:
+                    self.ceph_manager.raw_cluster_cmd('pg', 'cancel-force-backfill', *j)
+                else:
+                    self.ceph_manager.raw_cluster_cmd('pg', 'cancel-force-recovery', *j)
+            except CommandFailedError:
+                self.log('Failed to force backfill|recovery, ignoring')
 
     def force_cancel_recovery(self):
         """