ruby_reactor 0.8.5 → 0.8.6

data/lib/ruby_reactor/sweeper.rb

@@ -48,7 +48,9 @@ module RubyReactor
       reenqueued = 0
 
       @storage.scan_reactors(count: limit, include_dispatched_children: true).each do |reactor|
-        next unless reactor[:status] == "running" # non-terminal only
+        # Non-terminal only. A `rolling_back` run whose owner resume was lost
+        # is re-enqueued too: unsettled, it simply hands off again (009 S-5).
+        next unless %w[running rolling_back].include?(reactor[:status])
         next if @storage.lock_held?("async:#{reactor[:id]}") # worker alive -> leave alone
 
         @async_router.perform_async(reactor[:id], reactor[:class])

data/lib/ruby_reactor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubyReactor
-  VERSION = "0.8.5"
+  VERSION = "0.8.6"
 end

data/lib/ruby_reactor/web/api.rb

@@ -173,7 +173,7 @@ module RubyReactor
 
       def self.reactor_status(data)
         status = data[:status].to_s == "skipped" ? "halted" : data[:status].to_s
-        return status if %w[failed paused completed running halted pending aborted].include?(status)
+        return status if %w[failed paused completed running rolling_back halted pending aborted].include?(status)
         return "cancelled" if data[:cancelled]
         return "running" if data[:current_step]
         return "completed" if execution_evidence?(data)
@@ -393,7 +393,17 @@ module RubyReactor
         ref_data.merge("context" => child)
       end
 
+      # A map that rolled back distributed also carries its progress, `{
+      # total, settled, outstanding, failed }` (009 R-15). The records outlive
+      # the run, so a client shows it only while the run is `rolling_back`.
       def self.hydrate_map_ref(ref_data, reactor_class_name)
+        map_id = ref_data[:map_id] || ref_data["map_id"]
+        hydrated = hydrate_map_element(ref_data, reactor_class_name)
+        rollback = map_id && RubyReactor.configuration.storage_adapter.map_rollback_summary(map_id, reactor_class_name)
+        rollback ? hydrated.merge("rollback" => rollback.transform_keys(&:to_s)) : hydrated
+      end
+
+      def self.hydrate_map_element(ref_data, reactor_class_name)
         storage = RubyReactor.configuration.storage_adapter
         map_id = ref_data[:map_id] || ref_data["map_id"]