OSD: reset filestore_update_collections to false after do_convertfs

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 7e416f2f859ccdfcdeff9c536f53872699405f25..0f10118ec552ecdb7a5d11d7d24889b2d2a3f6f2 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -190,7 +190,6 @@ static int convert_collection(ObjectStore *store, coll_t cid)
 
 static int do_convertfs(ObjectStore *store)
 {
-  g_ceph_context->_conf->filestore_update_collections = true;
   int r = store->mount();
   if (r < 0)
     return r;
@@ -246,8 +245,11 @@ static int do_convertfs(ObjectStore *store)
 
 int OSD::convertfs(const std::string &dev, const std::string &jdev)
 {
+  g_ceph_context->_conf->filestore_update_collections = true;
   boost::scoped_ptr<ObjectStore> store(new FileStore(dev, jdev));
-  return do_convertfs(store.get());
+  int r = do_convertfs(store.get());
+  g_ceph_context->_conf->filestore_update_collections = false;
+  return r;
 }
 
 int OSD::mkfs(const std::string &dev, const std::string &jdev, ceph_fsid_t fsid, int whoami)