ensure that limestone datastore object is released during shutdown

project-tsurugi · Feb 25, 2025 · f78451c · f78451c
1 parent eea3074
commit f78451c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/src/concurrency_control/interface/shut_down.cpp b/src/concurrency_control/interface/shut_down.cpp
@@ -112,6 +112,7 @@ void fin_body([[maybe_unused]] bool force_shut_down_logging) try {
                                      << "shutdown:start_shutdown_datastore";
         datastore::get_datastore()
                 ->shutdown(); // this should after epoch::fin();
+        datastore::release_datastore();
         VLOG(log_debug_timing_event) << log_location_prefix_timing_event
                                      << "shutdown:end_shutdown_datastore";
         // cleanup about limestone

diff --git a/src/datastore/limestone/include/datastore.h b/src/datastore/limestone/include/datastore.h
@@ -18,6 +18,10 @@ start_datastore(limestone::api::configuration const& conf) {
     datastore_ = std::make_unique<limestone::api::datastore>(conf);
 }
 
+[[maybe_unused]] static void release_datastore() {
+    datastore_ = nullptr;
+}
+
 /**
  * @brief It executes create_channel and pass it to shirakami's executor.
  */