dynflow 0.8.28 → 0.8.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f99f6ec873faccef730dd4fb6ce79c51312bc21b
-  data.tar.gz: 74aa5ea6b417558dbfcda2c8b1d2f440a92691ea
+  metadata.gz: 52093e656e80afba8c3cfef6548c6abb978013af
+  data.tar.gz: 16d58712d8e3db65deb9f4c5f74a6f44d1fa4e0a
 SHA512:
-  metadata.gz: 1b9a59414928f60a2cda255b246f43499914674bf3d11dbf8055298ca3313b70cc5bd0723faec8564783390699e0e949134dc246ce0cd4ef2e00fb68542a85ad
-  data.tar.gz: 05f6150a9224ee2e1ce2eb0308f6b3ee35e75ffdfad4498259c2d4337622d7df8c30139974650adb16ea535de2027df7e23dba52b435ddaace0de6f15409fce1
+  metadata.gz: aeb9f630d85d36e9800f85faaaffcae780aa6b00e5783b5a001aa94dbf4eac56ebc9574eeee8115de0aea5c86e3451735e4e57d4e31bf96aaf3bc7f7f8b05a9b
+  data.tar.gz: ec28ae5dc1222952d5d5676937889e7c2f247f279475c24a6c24656f806d1fff60c78351ef343727af5635defe5dc3936298823e9cb88540ac28b772544bf182

data/dynflow.gemspec

@@ -29,8 +29,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rack-test"
   s.add_development_dependency "minitest"
   s.add_development_dependency "minitest-reporters"
-  s.add_development_dependency "activerecord", '< 5.0.0'
-  s.add_development_dependency 'activejob', '< 5.0.0'
+  s.add_development_dependency "activerecord"
+  s.add_development_dependency 'activejob'
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "sinatra"
   s.add_development_dependency 'mocha'

data/lib/dynflow.rb

@@ -23,6 +23,7 @@ module Dynflow
 
   require 'dynflow/utils'
   require 'dynflow/round_robin'
+  require 'dynflow/dead_letter_silencer'
   require 'dynflow/actor'
   require 'dynflow/actors'
   require 'dynflow/errors'

data/lib/dynflow/active_job/queue_adapter.rb

@@ -1,21 +1,25 @@
 module Dynflow
   module ActiveJob
     module QueueAdapters
+      module QueueMethods
+        def enqueue(job)
+          ::Rails.application.dynflow.world.trigger(JobWrapper, job.serialize)
+        end
+
+        def enqueue_at(job, timestamp)
+          ::Rails.application.dynflow.world.delay(JobWrapper, { :start_at => Time.at(timestamp) }, job.serialize)
+        end
+      end
+
       # To use Dynflow, set the queue_adapter config to +:dynflow+.
       #
       #   Rails.application.config.active_job.queue_adapter = :dynflow
       class DynflowAdapter
-        extend ActiveSupport::Concern
-
-        class << self
-          def enqueue(job)
-            ::Rails.application.dynflow.world.trigger(JobWrapper, job.serialize)
-          end
+        # For ActiveJob >= 5
+        include QueueMethods
 
-          def enqueue_at(job, timestamp)
-            ::Rails.application.dynflow.world.delay(JobWrapper, { :start_at => Time.at(timestamp) }, job.serialize)
-          end
-        end
+        # For ActiveJob <= 4
+        extend QueueMethods
       end
 
       class JobWrapper < Dynflow::Action

data/lib/dynflow/config.rb

@@ -97,6 +97,13 @@ module Dynflow
       true
     end
 
+    config_attr :silent_dead_letter_matchers, Array do
+      # By default suppress dead letters sent by Clock
+      [
+        DeadLetterSilencer::Matcher.new(::Dynflow::Clock)
+      ]
+    end
+
     config_attr :delayed_executor, DelayedExecutors::Abstract, NilClass do |world|
       options = { :poll_interval => 15,
                   :time_source => -> { Time.now.utc } }

data/lib/dynflow/dead_letter_silencer.rb

@@ -0,0 +1,46 @@
+module Dynflow
+  class DeadLetterSilencer < Concurrent::Actor::DefaultDeadLetterHandler
+    def initialize(matchers)
+      @matchers = Type! matchers, Array
+    end
+
+    def should_drop?(dead_letter)
+      @matchers.any? { |matcher| matcher.match? dead_letter }
+    end
+
+    def on_message(dead_letter)
+      super unless should_drop?(dead_letter)
+    end
+
+    private
+
+    class Matcher
+      Any = Algebrick.atom
+
+      def initialize(from, message = Any, to = Any)
+        @from = from
+        @message = message
+        @to = to
+      end
+
+      def match?(dead_letter)
+        evaluate(dead_letter.sender.actor_class, @from) &&
+          evaluate(dead_letter.message, @message) &&
+          evaluate(dead_letter.address.actor_class, @to)
+      end
+
+      private
+
+      def evaluate(thing, condition)
+        case condition
+        when Any
+          true
+        when Proc
+          condition.call(thing)
+        else
+          condition == thing
+        end
+      end
+    end
+  end
+end

data/lib/dynflow/executors/parallel/core.rb

@@ -53,6 +53,10 @@ module Dynflow
           super
         end
 
+        def dead_letter_routing
+          @world.dead_letter_handler
+        end
+
         private
 
         def on_message(message)

data/lib/dynflow/version.rb

@@ -1,3 +1,3 @@
 module Dynflow
-  VERSION = '0.8.28'
+  VERSION = '0.8.29'
 end

data/lib/dynflow/world.rb

@@ -8,7 +8,7 @@ module Dynflow
                 :transaction_adapter, :logger_adapter, :coordinator,
                 :persistence, :action_classes, :subscription_index,
                 :middleware, :auto_rescue, :clock, :meta, :delayed_executor, :auto_validity_check, :validity_check_timeout, :throttle_limiter,
-                :terminated, :execution_plan_cleaner
+                :terminated, :dead_letter_handler, :execution_plan_cleaner
 
     def initialize(config)
       @id                     = SecureRandom.uuid
@@ -29,6 +29,7 @@ module Dynflow
       @middleware             = Middleware::World.new
       @middleware.use Middleware::Common::Transaction if @transaction_adapter
       @client_dispatcher      = spawn_and_wait(Dispatcher::ClientDispatcher, "client-dispatcher", self)
+      @dead_letter_handler    = spawn_and_wait(DeadLetterSilencer, 'default_dead_letter_handler', config_for_world.silent_dead_letter_matchers)
       @meta                   = config_for_world.meta
       @auto_validity_check    = config_for_world.auto_validity_check
       @validity_check_timeout = config_for_world.validity_check_timeout

data/test/action_test.rb

@@ -623,9 +623,9 @@ module Dynflow
         specify 'polls for sub plans state' do
           world.stub :clock, clock do
             total = 2
-            triggered_plan = world.trigger(PollingParentAction, count: total)
-            plan = world.persistence.load_execution_plan(triggered_plan.id)
+            plan = world.plan(PollingParentAction, count: total)
             plan.state.must_equal :planned
+            world.execute(plan.id)
             clock.pending_pings.count.must_equal 0
             wait_for do
               plan.sub_plans.count == total &&
@@ -634,7 +634,7 @@ module Dynflow
             clock.pending_pings.count.must_equal 1
             clock.progress
             wait_for do
-              plan = world.persistence.load_execution_plan(triggered_plan.id)
+              plan = world.persistence.load_execution_plan(plan.id)
               plan.state == :stopped
             end
             clock.pending_pings.count.must_equal 0
@@ -644,12 +644,12 @@ module Dynflow
         specify 'starts polling for sub plans at the beginning' do
           world.stub :clock, clock do
             total = 2
-            triggered_plan = world.trigger(PollingBulkParentAction, count: total)
-            plan = world.persistence.load_execution_plan(triggered_plan.id)
+            plan = world.plan(PollingBulkParentAction, count: total)
             assert_nil plan.entry_action.output[:planning_finished]
             clock.pending_pings.count.must_equal 0
+            world.execute(plan.id)
             wait_for do
-              plan = world.persistence.load_execution_plan(triggered_plan.id)
+              plan = world.persistence.load_execution_plan(plan.id)
               plan.entry_action.output[:planning_finished] == 1
             end
             # Poll was set during #initiate
@@ -664,7 +664,7 @@ module Dynflow
             # Poll again
             clock.progress
             wait_for do
-              plan = world.persistence.load_execution_plan(triggered_plan.id)
+              plan = world.persistence.load_execution_plan(plan.id)
               plan.state == :stopped
             end
             plan.entry_action.output[:poll].must_equal 1

data/test/{activejob_adapter.rb → activejob_adapter_test.rb}

@@ -12,7 +12,7 @@ module Dynflow
   describe 'running jobs' do
     before(:all) do
       world = WorldFactory.create_world
-      ::ActiveJob::QueueAdapters.include(::Dynflow::ActiveJob::QueueAdapters)
+      ::ActiveJob::QueueAdapters.send(:include, ::Dynflow::ActiveJob::QueueAdapters)
       ::ActiveJob::Base.queue_adapter = :dynflow
       dynflow_mock = Minitest::Mock.new
       dynflow_mock.expect(:world, world)
@@ -20,7 +20,14 @@ module Dynflow
       rails_app_mock .expect(:dynflow, dynflow_mock)
       rails_mock = Minitest::Mock.new
       rails_mock.expect(:application, rails_app_mock)
-      ::Rails = rails_mock
+      @original_rails = ::Rails
+      Object.send(:remove_const, 'Rails')
+      Object.const_set('Rails', rails_mock)
+    end
+
+    after(:all) do
+      Object.send(:remove_const, 'Rails')
+      Object.const_set('Rails', @original_rails)
     end
 
     it 'is able to run the job right away' do

data/test/dead_letter_silencer_test.rb

@@ -0,0 +1,46 @@
+require_relative 'test_helper'
+require 'ostruct'
+
+module Dynflow
+  module DeadLetterSilencerTest
+    describe ::Dynflow::DeadLetterSilencer do
+      include Dynflow::Testing::Factories
+      include TestHelpers
+
+      let(:world) { WorldFactory.create_world }
+
+      it 'is started for each world' do
+        world.dead_letter_handler.actor_class
+             .must_equal ::Dynflow::DeadLetterSilencer
+      end
+
+      describe ::Dynflow::DeadLetterSilencer::Matcher do
+        let(:any) { DeadLetterSilencer::Matcher::Any }
+        let(:sender) { ::Dynflow::Clock }
+        let(:msg) { :ping }
+        let(:receiver) { ::Dynflow::DeadLetterSilencer }
+        let(:letter) do
+          OpenStruct.new(:sender => OpenStruct.new(:actor_class => sender),
+                         :message => msg,
+                         :address => OpenStruct.new(:actor_class => receiver))
+        end
+
+        it 'matches any' do
+          DeadLetterSilencer::Matcher.new(any, any, any).match?(letter).must_equal true
+        end
+
+        it 'matches comparing for equality' do
+          DeadLetterSilencer::Matcher.new(sender, msg, receiver)
+                                     .match?(letter).must_equal true
+          DeadLetterSilencer::Matcher.new(any, :bad, any).match?(letter).must_equal false
+        end
+
+        it 'matches by calling the proc' do
+          condition = proc { |actor_class| actor_class.is_a? Class }
+          DeadLetterSilencer::Matcher.new(condition, any, condition)
+                                     .match?(letter).must_equal true
+        end
+      end
+    end
+  end
+end

data/test/persistence_test.rb

@@ -231,7 +231,12 @@ module Dynflow
             stored = adapter.to_hash.fetch(:execution_plans).find { |ep| ep[:uuid].strip == original[:id] }
             stored.each { |k, v| stored[k] = v.to_s if v.is_a? Time }
             adapter.class::META_DATA.fetch(:execution_plan).each do |name|
-              stored.fetch(name.to_sym).must_equal original.fetch(name.to_sym)
+              value = original.fetch(name.to_sym)
+              if value.nil?
+                stored.fetch(name.to_sym).must_be_nil
+              else
+                stored.fetch(name.to_sym).must_equal value
+              end
             end
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynflow
 version: !ruby/object:Gem::Version
-  version: 0.8.28
+  version: 0.8.29
 platform: ruby
 authors:
 - Ivan Necas
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-24 00:00:00.000000000 Z
+date: 2017-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -155,30 +155,30 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -406,6 +406,7 @@ files:
 - lib/dynflow/coordinator_adapters.rb
 - lib/dynflow/coordinator_adapters/abstract.rb
 - lib/dynflow/coordinator_adapters/sequel.rb
+- lib/dynflow/dead_letter_silencer.rb
 - lib/dynflow/delayed_executors.rb
 - lib/dynflow/delayed_executors/abstract.rb
 - lib/dynflow/delayed_executors/abstract_core.rb
@@ -517,12 +518,13 @@ files:
 - lib/dynflow/world.rb
 - test/abnormal_states_recovery_test.rb
 - test/action_test.rb
-- test/activejob_adapter.rb
+- test/activejob_adapter_test.rb
 - test/batch_sub_tasks_test.rb
 - test/clock_test.rb
 - test/concurrency_control_test.rb
 - test/coordinator_test.rb
 - test/daemon_test.rb
+- test/dead_letter_silencer_test.rb
 - test/dispatcher_test.rb
 - test/execution_plan_cleaner_test.rb
 - test/execution_plan_test.rb
@@ -596,12 +598,13 @@ summary: DYNamic workFLOW engine
 test_files:
 - test/abnormal_states_recovery_test.rb
 - test/action_test.rb
-- test/activejob_adapter.rb
+- test/activejob_adapter_test.rb
 - test/batch_sub_tasks_test.rb
 - test/clock_test.rb
 - test/concurrency_control_test.rb
 - test/coordinator_test.rb
 - test/daemon_test.rb
+- test/dead_letter_silencer_test.rb
 - test/dispatcher_test.rb
 - test/execution_plan_cleaner_test.rb
 - test/execution_plan_test.rb