Wait for tasks finish when scheduler failed

src/IO/S3/copyS3File.cpp

@@ -66,17 +66,7 @@ namespace
         {
         }
 
-        virtual ~UploadHelper()
+        virtual ~UploadHelper() = default;
-        {
-            try
-            {
-                waitForAllBackGroundTasks();
-            }
-            catch (...)
-            {
-                tryLogCurrentException(__PRETTY_FUNCTION__);
-            }
-        }
 
     protected:
         std::shared_ptr<const S3::Client> client_ptr;
@@ -219,6 +209,8 @@ namespace
             size_t position = start_offset;
             size_t end_position = start_offset + size;
 
+            try
+            {
                 for (size_t part_number = 1; position < end_position; ++part_number)
                 {
                     if (multipart_upload_aborted)
@@ -231,6 +223,14 @@ namespace
 
                     position = next_position;
                 }
+            }
+            catch (...)
+            {
+                tryLogCurrentException(__PRETTY_FUNCTION__);
+                abortMultipartUpload();
+                waitForAllBackGroundTasks();
+                throw;
+            }
 
             waitForAllBackGroundTasks();
             completeMultipartUpload();