async-container-supervisor 0.9.1 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b997fac3e6c645d7740f0099a3543d27d983a86057a4cde23a85254d30a2d32f
-  data.tar.gz: 83f0ce708ade60a56158e615d6222788444bb2dfbc980cd6438a93dc6ef3c18b
+  metadata.gz: 4765d4a1500ef475808f032d7140aacd3beac8e939c68b34c3884d0cee53bef3
+  data.tar.gz: fc6fd02c0376c43685f32a2556122fa7c10d36388411241927f6bd58bf9a741f
 SHA512:
-  metadata.gz: f6baf3ac944b425114dcb952da846b73a35fbf183ddb078c4b273015b1951a7a4658b2eba72088994fee6a4df81ff5f7c9faf79ccc4cae1433ec7a4080e8c362
-  data.tar.gz: 2069afe1a540bc4733d7a5e6ae0c4d0270787bd500a940b6131c31427b6f21f97d0e29911eda516887e745b33d4a37210e1f935089a07af62143620e8800b2e7
+  metadata.gz: 43c99bc5e998157859b494039c62e44bbc2469a82824f482a6d5918c658c35a0e173a3f5c910f5a947b530bbbccdf8a0e1a7eb42a14f54ac268f6d4581b63a43
+  data.tar.gz: 8444b007dbdfc4a8ecfd6834cdf5e19d73939421ababec4be2dedc5db5d5d6551c29b9264259966df2d637b162dd0a63f847a7dbefdc683c429ee27a534d3b76

data/bake/async/container/supervisor.rb

@@ -44,7 +44,13 @@ def memory_sample(duration: 10, connection_id:)
 		operation = {do: :memory_sample, duration: duration}
 		
 		# Use the forward operation to proxy the request to a worker:
-		return connection.call(do: :forward, operation: operation, connection_id: connection_id)
+		response = connection.call(do: :forward, operation: operation, connection_id: connection_id)
+		
+		if response && response.key?(:data)
+			JSON.parse(response[:data], symbolize_names: true)
+		else
+			response
+		end
 	end
 end
 

data/lib/async/container/supervisor/client.rb

@@ -48,11 +48,11 @@ module Async
 				
 				# Run the client in a loop, reconnecting if necessary.
 				def run
-					Async(annotation: "Supervisor Client", transient: true) do
+					Async(annotation: "Supervisor Client", transient: true) do |task|
 						loop do
 							connection = connect!
 							
-							Async do
+							connected_task = task.async do
 								connected!(connection)
 							end
 							
@@ -61,6 +61,10 @@ module Async
 							Console.error(self, "Connection failed:", exception: error)
 							sleep(rand)
 						ensure
+							# Ensure any tasks that were created during connection are stopped:
+							connected_task&.stop
+							
+							# Close the connection itself:
 							connection&.close
 						end
 					end

data/lib/async/container/supervisor/connection.rb

@@ -253,8 +253,9 @@ module Async
 				#
 				# @parameter message [Hash] The message to write.
 				def write(**message)
-					@stream.write(JSON.dump(message) << "\n")
-					@stream.flush
+					raise IOError, "Connection is closed!" unless @stream
+					@stream&.write(JSON.dump(message) << "\n")
+					@stream&.flush # it is possible for @stream to become nil after the write call
 				end
 				
 				# Read a message from the connection stream.

data/lib/async/container/supervisor/memory_monitor.rb

@@ -30,6 +30,9 @@ module Async
 					@options = options
 					
 					@processes = Hash.new{|hash, key| hash[key] = Set.new.compare_by_identity}
+					
+					# Queue to serialize cluster modifications to prevent race conditions:
+					@guard = Mutex.new
 				end
 				
 				# @attribute [Memory::Leak::Cluster] The cluster of processes being monitored.
@@ -50,7 +53,10 @@ module Async
 						
 						if connections.empty?
 							Console.debug(self, "Registering process.", child: {process_id: process_id})
-							self.add(process_id)
+							# Queue the cluster modification to avoid race conditions:
+							@guard.synchronize do
+								self.add(process_id)
+							end
 						end
 						
 						connections.add(connection)
@@ -66,7 +72,9 @@ module Async
 						
 						if connections.empty?
 							Console.debug(self, "Removing process.", child: {process_id: process_id})
-							@cluster.remove(process_id)
+							@guard.synchronize do
+								@cluster.remove(process_id)
+							end
 						end
 					end
 				end
@@ -119,14 +127,16 @@ module Async
 				def run
 					Async do
 						Loop.run(interval: @interval) do
-							# This block must return true if the process was killed.
-							@cluster.check! do |process_id, monitor|
-								Console.error(self, "Memory leak detected!", child: {process_id: process_id}, monitor: monitor)
-								
-								begin
-									memory_leak_detected(process_id, monitor)
-								rescue => error
-									Console.error(self, "Failed to handle memory leak!", child: {process_id: process_id}, exception: error)
+							@guard.synchronize do
+								# This block must return true if the process was killed.
+								@cluster.check! do |process_id, monitor|
+									Console.error(self, "Memory leak detected!", child: {process_id: process_id}, monitor: monitor)
+									
+									begin
+										memory_leak_detected(process_id, monitor)
+									rescue => error
+										Console.error(self, "Failed to handle memory leak!", child: {process_id: process_id}, exception: error)
+									end
 								end
 							end
 						end

data/lib/async/container/supervisor/version.rb

@@ -9,7 +9,7 @@ module Async
 	module Container
 		# @namespace
 		module Supervisor
-			VERSION = "0.9.1"
+			VERSION = "0.9.3"
 		end
 	end
 end

data/lib/async/container/supervisor/worker.rb

@@ -117,7 +117,7 @@ module Async
 					report = sampler.report
 					
 					dump(call) do |file|
-						file.puts(report.to_s)
+						file.puts(report.to_json)
 					end
 				ensure
 					GC.start

data/readme.md

@@ -26,6 +26,10 @@ Please see the [project documentation](https://socketry.github.io/async-containe
 
 Please see the [project releases](https://socketry.github.io/async-container-supervisor/releases/index) for all releases.
 
+### v0.9.3
+
+  - Serialize `register`/`remove` and `check!` operations in `MemoryMonitor`.
+
 ### v0.9.1
 
   - Close `Call` queue if asynchronous call fails during dispatch - further messages will fail with `ClosedQueueError`.

data/releases.md

@@ -1,5 +1,9 @@
 # Releases
 
+## v0.9.3
+
+  - Serialize `register`/`remove` and `check!` operations in `MemoryMonitor`.
+
 ## v0.9.1
 
   - Close `Call` queue if asynchronous call fails during dispatch - further messages will fail with `ClosedQueueError`.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: async-container-supervisor
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.3
 platform: ruby
 authors:
 - Samuel Williams
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: A supervisor for managing multiple container processes.
 test_files: []