WIP

Author: samuel-williams-shopify

.github/workflows/test-external.yaml

@@ -43,5 +43,5 @@ jobs:
         bundler-cache: true
 
     - name: Run tests
-      timeout-minutes: 10
-      run: bundle exec sus --verbose
+      timeout-minutes: 1
+      run: CONSOLE_LEVEL=debug bundle exec sus --verbose test/async/container/controller.rb:200

.github/workflows/test.yaml

@@ -6,6 +6,10 @@
 
 require_relative "../../../../lib/async/container/controller"
 
+current_sigint = Signal.trap(:INT){$stderr.puts("---INT---", caller_locations); Thread.main.raise(Interrupt)}
+current_sigterm = Signal.trap(:TERM){Thread.main.raise(Interrupt)}
+Console.info(self, "Traps were:", sigint: current_sigint, sigterm: current_sigterm)
+
 $stdout.sync = true
 
 class Bad < Async::Container::Controller

fixtures/async/container/controllers/bad.rb

@@ -309,7 +309,7 @@ def run(signals: Async::Signals.default)
 					end
 				end
 			rescue Interrupt
-				self.stop(false)
+				# Ignore - normal shutdown - can propagate from top level Sync.
 			end
 		end
 	end

lib/async/container/controller.rb

@@ -104,10 +104,6 @@ def self.fork(**options)
 						# Fork from `Thread.new` so the child does not inherit the parent fiber scheduler or the current caller's fiber stack. Only this short-lived thread is copied into the child process:
 						::Thread.new do
 							::Process.fork do
-								# Convert process signals into pending interrupts on the surviving fork thread so they respect `Thread.handle_interrupt` in the child:
-								::Signal.trap(:INT){::Thread.current.raise(::Interrupt)}
-								::Signal.trap(:TERM){::Thread.current.raise(::Interrupt)}
-								
 								# Reset interrupt masking - `Exception` is a fast path:
 								::Thread.handle_interrupt(Exception => :immediate) do
 									yield Instance.for(process)

lib/async/container/forked.rb

@@ -200,9 +200,11 @@ def controller.setup(container)
 		it "fails to start" do
 			expect(input.gets).to be == "Ready...\n"
 
+			$stderr.puts "Sending SIGINT to #{process_id}..."
 			Process.kill(:INT, process_id)
 
 			# It was killed:
+			$stderr.puts "Waiting for killed..."
 			expect(input.gets).to be_nil
 		end
 	end