Merge pull request #212 from JianyuLi/fix-concurrent-raft-create-core

fix coredump issue when creating multiple raft groups concurrently in meta merge mode
baidu · May 26, 2020 · eeefc95 · eeefc95
2 parents dd81e5b + efa0712
commit eeefc95
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/braft/raft_meta.cpp b/src/braft/raft_meta.cpp
@@ -106,7 +106,7 @@ class MetaStorageManager {
     typedef butil::DoublyBufferedData<MetaStorageMap> DoublyBufferedMetaStorageMap;
 
     static size_t _add(MetaStorageMap& m, const std::string& path, 
-                       const scoped_refptr<KVBasedMergedMetaStorageImpl> mss) {
+                       const scoped_refptr<KVBasedMergedMetaStorageImpl>& mss) {
         std::pair<MetaStorageMap::const_iterator, bool> iter = 
                                         m.insert(std::make_pair(path, mss));
         if (iter.second) {

diff --git a/src/braft/raft_meta.h b/src/braft/raft_meta.h
@@ -143,11 +143,12 @@ friend class scoped_refptr<KVBasedMergedMetaStorageImpl>;
 
 public:
     explicit KVBasedMergedMetaStorageImpl(const std::string& path)
-        : _is_inited(false), _path(path) {}
+        : _is_inited(false), _path(path), _db(nullptr) {}
     KVBasedMergedMetaStorageImpl() {}
     virtual ~KVBasedMergedMetaStorageImpl() {
         if (_db) {
             delete _db;
+            _db = nullptr;
         }
     }