Merge pull request #19765 from liewegas/wip-force-backfill-cleanups

qa: tolerate failure to force backfill Reviewed-by: Kefu Chai <kchai@redhat.com>
ceph · Jan 8, 2018 · c30eca5 · c30eca5
2 parents 5784779 + 78b7f10
commit c30eca5
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/qa/tasks/ceph_manager.py b/qa/tasks/ceph_manager.py
@@ -560,10 +560,14 @@ def force_recovery(self):
         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):
         """
@@ -572,10 +576,13 @@ def cancel_force_recovery(self):
         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):
         """

diff --git a/src/mgr/DaemonServer.cc b/src/mgr/DaemonServer.cc
@@ -1219,7 +1219,7 @@ bool DaemonServer::handle_command(MCommand *m)
 	  } else {
 	    auto workit = pg_map.pg_stat.find(parsed_pg);
 	    if (workit == pg_map.pg_stat.end()) {
-	      ss << "pg " << pstr << " not exists; ";
+	      ss << "pg " << pstr << " does not exist; ";
 	      r = -ENOENT;
 	    } else {
 	      pg_stat_t workpg = workit->second;