]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
os/bluestore: Call get_str_map under with_val
authorAdam C. Emerson <aemerson@redhat.com>
Mon, 20 Nov 2017 21:14:18 +0000 (16:14 -0500)
committerAdam C. Emerson <aemerson@redhat.com>
Thu, 7 Dec 2017 20:46:12 +0000 (15:46 -0500)
Another heap allocation bites the dust.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
src/os/bluestore/BlueStore.cc

index 04cdedb95733603a40dd5e8f446aeb73c027239c..db500c5d6f75cb0b998b2d1f005cb1d47d462440 100644 (file)
@@ -4785,8 +4785,10 @@ int BlueStore::_open_db(bool create, bool to_repair_db)
     options = cct->_conf->bluestore_rocksdb_options;
 
     map<string,string> cf_map;
-    get_str_map(cct->_conf->get_val<string>("bluestore_rocksdb_cfs"), &cf_map,
-               " \t");
+    cct->_conf->with_val<string>("bluestore_rocksdb_cfs",
+                                 get_str_map,
+                                 &cf_map,
+                                 " \t");
     for (auto& i : cf_map) {
       dout(10) << "column family " << i.first << ": " << i.second << dendl;
       cfs.push_back(KeyValueDB::ColumnFamily(i.first, i.second));