I am just too crazy at this point

Author: arthurpassos

src/Storages/MergeTree/MergeTreeData.cpp

@@ -6283,7 +6283,14 @@ void MergeTreeData::killExportPart(const String & transaction_id)
 
     std::erase_if(export_manifests, [&](const auto & manifest)
     {
-        return manifest.transaction_id == transaction_id;
+        if (manifest.transaction_id == transaction_id)
+        {
+            if (manifest.task)
+                manifest.task->cancel();
+
+            return true;
+        }
+        return false;
     });
 }
 
@@ -9130,13 +9137,17 @@ bool MergeTreeData::scheduleDataMovingJob(BackgroundJobsAssignee & assignee)
         context_copy->setCurrentQueryId(manifest.transaction_id);
         context_copy->setBackgroundOperationTypeForContext(ClientInfo::BackgroundOperationType::EXPORT_PART);
 
-        manifest.in_progress = assignee.scheduleMoveTask(std::make_shared<ExportPartTask>(*this, manifest, context_copy));
+        auto task = std::make_shared<ExportPartTask>(*this, manifest, context_copy);
+
+        manifest.in_progress = assignee.scheduleMoveTask(task);
 
         if (!manifest.in_progress)
         {
             continue;
         }
 
+        manifest.task = task;
+
         return true;
     }
 

src/Storages/MergeTree/MergeTreePartExportManifest.h

@@ -73,6 +73,7 @@ struct MergeTreePartExportManifest
 
     time_t create_time;
     mutable bool in_progress = false;
+    mutable std::shared_ptr<ExportPartTask> task = nullptr;
 
     bool operator<(const MergeTreePartExportManifest & rhs) const 
     {