From: Sage Weil <sage@newdream.net>
Date: Tue, 13 Jul 2021 18:44:57 +0000 (-0400)
Subject: qa/tasks/rebuild_mondb: fix rebuild vs logmonitor external_log_to
X-Git-Tag: v17.1.0~1417^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F42319%2Fhead;p=ceph.git

qa/tasks/rebuild_mondb: fix rebuild vs logmonitor external_log_to

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/qa/tasks/rebuild_mondb.py b/qa/tasks/rebuild_mondb.py
index 008e312e2d3d..bbf6383b11b4 100644
--- a/qa/tasks/rebuild_mondb.py
+++ b/qa/tasks/rebuild_mondb.py
@@ -66,6 +66,10 @@ def _nuke_mons(manager, mons, mon_id):
                 # the its store.db with the recovered one
                 store_dir = os.path.join(mon_data, 'store.db')
                 remote.run(args=['sudo', 'rm', '-r', store_dir])
+                # we need to remove the external_log_to file too, since it
+                # references a version number inside store.db
+                remote.run(args=['sudo', 'rm', '-r', os.path.join(mon_data,
+                                                                  'external_log_to')])
             else:
                 remote.run(args=['sudo', 'rm', '-r', mon_data])