Merge pull request #1167 from Altinity/export_replicated_mt_partition_v2

Cleanup export manifests - attempt to prevent crash

Author: Enmk

src/Storages/StorageMergeTree.cpp

@@ -256,6 +256,11 @@ void StorageMergeTree::shutdown(bool)
 
     if (deduplication_log)
         deduplication_log->shutdown();
+
+    {
+        std::lock_guard lock(export_manifests_mutex);
+        export_manifests.clear();
+    }
 }
 
 

src/Storages/StorageReplicatedMergeTree.cpp

@@ -6014,6 +6014,17 @@ void StorageReplicatedMergeTree::shutdown(bool)
         /// Wait for all of them
         std::lock_guard lock(data_parts_exchange_ptr->rwlock);
     }
+
+    {
+        std::lock_guard lock(export_merge_tree_partition_mutex);
+        export_merge_tree_partition_task_entries.clear();
+    }
+
+    {
+        std::lock_guard lock(export_manifests_mutex);
+        export_manifests.clear();
+    }
+
     LOG_TRACE(log, "Shutdown finished");
 }