update sources to v12.1.1

[ceph.git] / ceph / src / os / filestore / IndexManager.cc

diff --git a/ceph/src/os/filestore/IndexManager.cc b/ceph/src/os/filestore/IndexManager.cc
index c148afc46c80f679d7dcd868c56e6e14ce0a2ffe..74cc454ffd8b120a1c38a459c2c04a45f69ff112 100644 (file)
--- a/ceph/src/os/filestore/IndexManager.cc
+++ b/ceph/src/os/filestore/IndexManager.cc
@@ -82,7 +82,10 @@ int IndexManager::init_index(coll_t c, const char *path, uint32_t version) {
                  cct->_conf->filestore_split_multiple,
                  version,
                  cct->_conf->filestore_index_retry_probability);
-  return index.init();
+  r = index.init();
+  if (r < 0)
+    return r;
+  return index.read_settings();
 }
 
 int IndexManager::build_index(coll_t c, const char *path, CollectionIndex **index) {
@@ -102,8 +105,9 @@ int IndexManager::build_index(coll_t c, const char *path, CollectionIndex **inde
       // Must be a HashIndex
       *index = new HashIndex(cct, c, path,
                             cct->_conf->filestore_merge_threshold,
-                            cct->_conf->filestore_split_multiple, version);
-      return 0;
+                            cct->_conf->filestore_split_multiple,
+                            version);
+      return (*index)->read_settings();
     }
     default: ceph_abort();
     }
@@ -114,7 +118,7 @@ int IndexManager::build_index(coll_t c, const char *path, CollectionIndex **inde
                           cct->_conf->filestore_split_multiple,
                           CollectionIndex::HOBJECT_WITH_POOL,
                           cct->_conf->filestore_index_retry_probability);
-    return 0;
+    return (*index)->read_settings();
   }
 }