Added IsRunning member to MonoQueuePool so TileGroupCompactor can che…

…ck if system is shutting down to avoid a race and stop trying to compact. Resolves segfault in tile_group_compactor_test.
cmu-db · May 25, 2018 · 36d546d · 36d546d
1 parent 7426410
commit 36d546d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/src/gc/tile_group_compactor.cpp b/src/gc/tile_group_compactor.cpp
@@ -26,7 +26,7 @@ void TileGroupCompactor::CompactTileGroup(const oid_t &tile_group_id) {
 
   auto pause_time = minPauseTime;
 
-  while (attempts < max_attempts) {
+  while (attempts < max_attempts && threadpool::MonoQueuePool::GetInstance().IsRunning()) {
     auto tile_group =
         catalog::Manager::GetInstance().GetTileGroup(tile_group_id);
     if (tile_group == nullptr) {

diff --git a/src/include/threadpool/mono_queue_pool.h b/src/include/threadpool/mono_queue_pool.h
@@ -32,6 +32,8 @@ class MonoQueuePool {
 
   void Shutdown();
 
+  bool IsRunning() const { return is_running_; }
+
   template <typename F>
   void SubmitTask(const F &func);
 

diff --git a/test/gc/tile_group_compactor_test.cpp b/test/gc/tile_group_compactor_test.cpp
@@ -123,6 +123,7 @@ TEST_F(TileGroupCompactorTests, GCIntegrationTestSparse) {
   LOG_DEBUG("tile_group_count_after_gc: %zu", tile_group_count_after_gc);
   EXPECT_EQ(tile_group_count_after_gc, tile_group_count_after_init);
 
+  threadpool::MonoQueuePool::GetInstance().Shutdown();
   gc_manager.StopGC();
   gc::GCManagerFactory::Configure(0);
 
@@ -213,6 +214,7 @@ TEST_F(TileGroupCompactorTests, GCIntegrationTestDense) {
   LOG_DEBUG("tile_group_count_after_gc: %zu", tile_group_count_after_gc);
   EXPECT_EQ(tile_group_count_after_delete, tile_group_count_after_gc);
 
+  threadpool::MonoQueuePool::GetInstance().Shutdown();
   gc_manager.StopGC();
   gc::GCManagerFactory::Configure(0);
 
@@ -328,6 +330,7 @@ TEST_F(TileGroupCompactorTests, ConcurrentUpdateTest) {
   table.release();
   TestingExecutorUtil::DeleteDatabase(test_name + "db");
   epoch_manager.SetCurrentEpochId(++current_epoch);
+  threadpool::MonoQueuePool::GetInstance().Shutdown();
   gc_manager.StopGC();
   gc::GCManagerFactory::Configure(0);
   EXPECT_FALSE(storage_manager->HasDatabase(db_id));
@@ -412,6 +415,7 @@ TEST_F(TileGroupCompactorTests, EdgeCasesTest) {
 
   TestingExecutorUtil::DeleteDatabase(test_name + "db");
   epoch_manager.SetCurrentEpochId(++current_epoch);
+  threadpool::MonoQueuePool::GetInstance().Shutdown();
   gc_manager.StopGC();
   gc::GCManagerFactory::Configure(0);
   EXPECT_FALSE(storage_manager->HasDatabase(db_id));
@@ -493,6 +497,7 @@ TEST_F(TileGroupCompactorTests, RetryTest) {
   table.release();
   TestingExecutorUtil::DeleteDatabase(test_name + "db");
   epoch_manager.SetCurrentEpochId(++current_epoch);
+  threadpool::MonoQueuePool::GetInstance().Shutdown();
   gc_manager.StopGC();
   gc::GCManagerFactory::Configure(0);
   EXPECT_FALSE(storage_manager->HasDatabase(db_id));