bug mongo: fix UB on stop

userver-framework · Dec 12, 2023 · b65445d · b65445d
1 parent 99bad8b
commit b65445d
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 2 deletions.
diff --git a/core/include/userver/congestion_control/controllers/v2.hpp b/core/include/userver/congestion_control/controllers/v2.hpp
@@ -34,6 +34,7 @@ class Controller {
   virtual ~Controller() = default;
 
   void Start();
+  void Stop();
 
   void Step();
 

diff --git a/core/src/congestion_control/controllers/v2.cpp b/core/src/congestion_control/controllers/v2.cpp
@@ -38,6 +38,8 @@ void Controller::Start() {
   }
 }
 
+void Controller::Stop() { periodic_.Stop(); }
+
 std::string_view Controller::LogFakeMode() const {
   if (config_.fake_mode)
     return " (fake mode)";

diff --git a/mongo/include/userver/storages/mongo/pool.hpp b/mongo/include/userver/storages/mongo/pool.hpp
@@ -48,6 +48,8 @@ class Pool {
   ~Pool();
 
   void Start();
+
+  void Stop();
   /// @endcond
 
   /// Checks whether a collection exists

diff --git a/mongo/src/storages/mongo/component.cpp b/mongo/src/storages/mongo/component.cpp
@@ -68,7 +68,11 @@ Mongo::Mongo(const ComponentConfig& config, const ComponentContext& context)
       {{"mongo_database", section_name}});
 }
 
-Mongo::~Mongo() { statistics_holder_.Unregister(); }
+Mongo::~Mongo() {
+  pool_->Stop();
+
+  statistics_holder_.Unregister();
+}
 
 storages::mongo::PoolPtr Mongo::GetPool() const { return pool_; }
 

diff --git a/mongo/src/storages/mongo/multi_mongo.cpp b/mongo/src/storages/mongo/multi_mongo.cpp
@@ -51,7 +51,13 @@ void MultiMongo::PoolSet::AddPool(std::string dbalias) {
 }
 
 bool MultiMongo::PoolSet::RemovePool(const std::string& dbalias) {
-  return pool_map_ptr_->erase(dbalias);
+  auto it = pool_map_ptr_->find(dbalias);
+  if (it != pool_map_ptr_->end()) {
+    it->second->Stop();
+    return pool_map_ptr_->erase(it) != pool_map_ptr_->end();
+  } else {
+    return false;
+  }
 }
 
 void MultiMongo::PoolSet::Activate() {

diff --git a/mongo/src/storages/mongo/pool.cpp b/mongo/src/storages/mongo/pool.cpp
@@ -28,6 +28,8 @@ Pool::Pool(std::string id, const std::string& uri,
 
 void Pool::Start() { impl_->Start(); }
 
+void Pool::Stop() { impl_->Stop(); }
+
 Pool::~Pool() = default;
 
 void Pool::DropDatabase() {

diff --git a/mongo/src/storages/mongo/pool_impl.cpp b/mongo/src/storages/mongo/pool_impl.cpp
@@ -26,6 +26,8 @@ PoolImpl::PoolImpl(std::string&& id, const PoolConfig& static_config,
 
 void PoolImpl::Start() { cc_controller_.Start(); }
 
+void PoolImpl::Stop() { cc_controller_.Stop(); }
+
 void PoolImpl::OnConfigUpdate(const dynamic_config::Snapshot& config) {
   cc_controller_.SetEnabled(config[kCongestionControlEnabled]);
 }

diff --git a/mongo/src/storages/mongo/pool_impl.hpp b/mongo/src/storages/mongo/pool_impl.hpp
@@ -21,6 +21,7 @@ class PoolImpl {
   virtual ~PoolImpl() = default;
 
   void Start();
+  void Stop();
 
   const std::string& Id() const;
   const stats::PoolStatistics& GetStatistics() const;