Ensure thread-pool shutdown.

Homebrew · Sep 7, 2024 · b68ee41 · b68ee41
1 parent 69a04bd
commit b68ee41
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/Library/Homebrew/cmd/fetch.rb b/Library/Homebrew/cmd/fetch.rb
@@ -301,6 +301,8 @@ def run
                   # FIXME: Implement cancellation of running downloads.
                 end
 
+                download_queue.cancel
+
                 if previous_pending_line_count.positive?
                   $stdout.print Tty.move_cursor_down(previous_pending_line_count - 1)
                   $stdout.flush
@@ -314,7 +316,7 @@ def run
             $stdout.flush
           end
         end
-
+      ensure
         download_queue.shutdown
       end
 

diff --git a/Library/Homebrew/download_queue.rb b/Library/Homebrew/download_queue.rb
@@ -28,9 +28,18 @@ def enqueue(downloadable, force: false)
       # rubocop:enable Lint/ShadowingOuterLocalVariable
     end
 
+    sig { void }
+    def cancel
+      # FIXME: Implement graceful cancellaction of running downloads based on
+      #        https://ruby-concurrency.github.io/concurrent-ruby/master/Concurrent/Cancellation.html
+      #        instead of killing the whole thread pool.
+      pool.kill
+    end
+
     sig { void }
     def shutdown
       pool.shutdown
+      pool.wait_for_termination
     end
   end
 end