dynflow 1.8.2 → 1.8.4

data/lib/dynflow/telemetry.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'dynflow/telemetry_adapters/abstract'
 require 'dynflow/telemetry_adapters/dummy'
 require 'dynflow/telemetry_adapters/statsd'
@@ -18,7 +19,7 @@ module Dynflow
       # Passes the block into the current telemetry adapter's
       # {TelemetryAdapters::Abstract#with_instance} method
       def with_instance(&block)
-        @instance.with_instance &block
+        @instance.with_instance(&block)
       end
 
       def measure(name, tags = {}, &block)
@@ -33,32 +34,32 @@ module Dynflow
         with_instance do |t|
           # Worker related
           t.add_gauge   :dynflow_active_workers, 'The number of currently busy workers',
-                        [:queue, :world]
+            [:queue, :world]
           t.add_counter :dynflow_worker_events, 'The number of processed events',
-                        [:queue, :world, :worker]
+            [:queue, :world, :worker]
 
           # Execution plan related
           t.add_gauge   :dynflow_active_execution_plans, 'The number of active execution plans',
-                        [:action, :world, :state]
+            [:action, :world, :state]
           t.add_gauge   :dynflow_queue_size, 'Number of items in queue',
-                        [:queue, :world]
+            [:queue, :world]
           t.add_counter :dynflow_finished_execution_plans, 'The number of execution plans',
-                        [:action, :world, :result]
+            [:action, :world, :result]
 
           # Step related
           # TODO: Configure buckets in a sane manner
           t.add_histogram :dynflow_step_real_time, 'The time between the start end end of the step',
-                          [:action, :phase]
+            [:action, :phase]
           t.add_histogram :dynflow_step_execution_time, 'The time spent executing a step',
-                          [:action, :phase]
+            [:action, :phase]
 
           # Connector related
           t.add_counter :dynflow_connector_envelopes, 'The number of envelopes handled by a connector',
-                        [:world, :direction]
+            [:world, :direction]
 
           # Persistence related
           t.add_histogram :dynflow_persistence, 'The time spent communicating with the database',
-                          [:world, :method]
+            [:world, :method]
         end
       end
     end

data/lib/dynflow/telemetry_adapters/abstract.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
   module TelemetryAdapters
     class Abstract

data/lib/dynflow/telemetry_adapters/dummy.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
   module TelemetryAdapters
     # Telemetry adapter which does not evaluate blocks passed to {#with_instance}.

data/lib/dynflow/telemetry_adapters/statsd.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
   module TelemetryAdapters
     class StatsD < Abstract
@@ -42,7 +43,7 @@ module Dynflow
       def name_tag_mapping(name, tags)
         instances = @instances[name]
         return name if instances.nil? || instances.empty?
-        (name.to_s + '.' + instances.map {|x| tags[x]}.compact.join('.')).tr('-:/ ', '____')
+        (name.to_s + '.' + instances.map { |x| tags[x] }.compact.join('.')).tr('-:/ ', '____')
       end
     end
   end

data/lib/dynflow/testing/assertions.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
   module Testing
     module Assertions
@@ -15,8 +16,8 @@ module Dynflow
         end
 
         assert(!found.empty?,
-               "Action #{planned_action_class} with plan_input #{plan_input} was not planned, " +
-                   "there were only #{found_classes.map(&:plan_input)}")
+          "Action #{planned_action_class} with plan_input #{plan_input} was not planned, " +
+              "there were only #{found_classes.map(&:plan_input)}")
         found
       end
 
@@ -24,8 +25,8 @@ module Dynflow
       def assert_action_planned(action, planned_action_class)
         Match! action.phase, Action::Plan
         Match! action.state, :success
-        found = action.execution_plan.planned_plan_steps.
-            select { |a| a.is_a?(planned_action_class) }
+        found = action.execution_plan.planned_plan_steps
+                      .select { |a| a.is_a?(planned_action_class) }
 
         assert(!found.empty?, "Action #{planned_action_class} was not planned")
         found
@@ -34,8 +35,8 @@ module Dynflow
       def refute_action_planned(action, planned_action_class)
         Match! action.phase, Action::Plan
         Match! action.state, :success
-        found = action.execution_plan.planned_plan_steps.
-            select { |a| a.is_a?(planned_action_class) }
+        found = action.execution_plan.planned_plan_steps
+                      .select { |a| a.is_a?(planned_action_class) }
 
         assert(found.empty?, "Action #{planned_action_class} was planned")
         found
@@ -74,7 +75,6 @@ module Dynflow
         Match! action.state, :success
         _(action.execution_plan.planned_finalize_steps).wont_include action
       end
-
     end
   end
 end

data/lib/dynflow/testing/dummy_coordinator.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
   module Testing
     class DummyCoordinator

data/lib/dynflow/testing/dummy_execution_plan.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
   module Testing
     class DummyExecutionPlan

data/lib/dynflow/testing/dummy_executor.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
   module Testing
     class DummyExecutor

data/lib/dynflow/testing/dummy_planned_action.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
   module Testing
     class DummyPlannedAction
@@ -8,7 +9,8 @@ module Dynflow
       def initialize(klass)
         mimic! klass
         @output = ExecutionPlan::OutputReference.new(
-            Testing.get_id.to_s, Testing.get_id, Testing.get_id)
+          Testing.get_id.to_s, Testing.get_id, Testing.get_id
+        )
       end
 
       def execute(execution_plan, event, from_subscription, *args)

data/lib/dynflow/testing/dummy_step.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
   module Testing
     class DummyStep

data/lib/dynflow/testing/dummy_world.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
   module Testing
     class DummyWorld

data/lib/dynflow/testing/factories.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
   module Testing
     module Factories
@@ -9,14 +10,15 @@ module Dynflow
         execution_plan = DummyExecutionPlan.new
         step           = DummyStep.new
         action_class.new(
-            { step:              DummyStep.new,
-              execution_plan_id: execution_plan.id,
-              id:                Testing.get_id,
-              phase:             Action::Plan,
-              plan_step_id:      step.id,
-              run_step_id:       nil,
-              finalize_step_id:  nil },
-            execution_plan.world).tap do |action|
+          { step:              DummyStep.new,
+            execution_plan_id: execution_plan.id,
+            id:                Testing.get_id,
+            phase:             Action::Plan,
+            plan_step_id:      step.id,
+            run_step_id:       nil,
+            finalize_step_id:  nil },
+          execution_plan.world
+        ).tap do |action|
           action.set_plan_context(execution_plan, trigger, false)
         end
       end
@@ -24,22 +26,23 @@ module Dynflow
       def create_action_presentation(action_class)
         execution_plan = DummyExecutionPlan.new
         action_class.new(
-            { execution_plan:    execution_plan,
-              execution_plan_id: execution_plan.id,
-              id:                Testing.get_id,
-              phase:             Action::Present,
-              plan_step_id:      1,
-              run_step_id:       nil,
-              finalize_step_id:  nil,
-              input:             nil },
-            execution_plan.world)
+          { execution_plan:    execution_plan,
+            execution_plan_id: execution_plan.id,
+            id:                Testing.get_id,
+            phase:             Action::Present,
+            plan_step_id:      1,
+            run_step_id:       nil,
+            finalize_step_id:  nil,
+            input:             nil },
+          execution_plan.world
+        )
       end
 
       # @return [Action::PlanPhase]
       def plan_action(plan_action, *args, &block)
         Match! plan_action.phase, Action::Plan
 
-        plan_action.execute *args, &block
+        plan_action.execute(*args, &block)
         raise plan_action.error if plan_action.error
         plan_action
       end
@@ -58,15 +61,16 @@ module Dynflow
         step       = DummyStep.new
         run_action = if plan_action.phase == Action::Plan
                        plan_action.class.new(
-                           { step:              step,
-                             execution_plan_id: plan_action.execution_plan_id,
-                             id:                plan_action.id,
-                             plan_step_id:      plan_action.plan_step_id,
-                             run_step_id:       step.id,
-                             finalize_step_id:  nil,
-                             phase:             Action::Run,
-                             input:             plan_action.input },
-                           plan_action.world)
+                         { step:              step,
+                           execution_plan_id: plan_action.execution_plan_id,
+                           id:                plan_action.id,
+                           plan_step_id:      plan_action.plan_step_id,
+                           run_step_id:       step.id,
+                           finalize_step_id:  nil,
+                           phase:             Action::Run,
+                           input:             plan_action.input },
+                         plan_action.world
+                       )
 
                      else
                        plan_action
@@ -85,22 +89,23 @@ module Dynflow
         Match! run_action.phase, Action::Plan, Action::Run
         step            = DummyStep.new
         finalize_action = run_action.class.new(
-            { step:              step,
-              execution_plan_id: run_action.execution_plan_id,
-              id:                run_action.id,
-              plan_step_id:      run_action.plan_step_id,
-              run_step_id:       run_action.run_step_id,
-              finalize_step_id:  step.id,
-              phase:             Action::Finalize,
-              input:             run_action.input },
-            run_action.world)
+          { step:              step,
+            execution_plan_id: run_action.execution_plan_id,
+            id:                run_action.id,
+            plan_step_id:      run_action.plan_step_id,
+            run_step_id:       run_action.run_step_id,
+            finalize_step_id:  step.id,
+            phase:             Action::Finalize,
+            input:             run_action.input },
+          run_action.world
+        )
 
         stubbing.call finalize_action if stubbing
         finalize_action.execute
         finalize_action
       end
 
-      def progress_action_time action
+      def progress_action_time(action)
         Match! action.phase, Action::Run
         if action.world.clock.progress
           return action.world.executor.progress

data/lib/dynflow/testing/in_thread_executor.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
   module Testing
     class InThreadExecutor

data/lib/dynflow/testing/in_thread_world.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
   module Testing
     class InThreadWorld < Dynflow::World

data/lib/dynflow/testing/managed_clock.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
+
 module Dynflow
   module Testing
     class ManagedClock
-
       attr_reader :pending_pings
 
       include Algebrick::Types

data/lib/dynflow/testing/mimic.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
+
 module Dynflow
   module Testing
-
     # when extended into Class or an_object it makes all instances of the class or the object
     # mimic the supplied types. It does so by hooking into kind_of? method.
     # @example
@@ -18,7 +18,7 @@ module Dynflow
       end
 
       def mimic!(*types)
-        define =-> _ do
+        define = ->_ do
           define_method :mimic_types do
             types
           end
@@ -30,9 +30,9 @@ module Dynflow
         end
 
         if self.kind_of? ::Class
-          self.class_eval &define
+          self.class_eval(&define)
         else
-          self.singleton_class.class_eval &define
+          self.singleton_class.class_eval(&define)
         end
 
         self

data/lib/dynflow/testing.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
   module Testing
     extend Algebrick::TypeCheck

data/lib/dynflow/throttle_limiter.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
+
 module Dynflow
   class ThrottleLimiter
-
     attr_reader :core
 
     def initialize(world)

data/lib/dynflow/transaction_adapters/abstract.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
   module TransactionAdapters
     class Abstract

data/lib/dynflow/transaction_adapters/active_record.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
   module TransactionAdapters
     class ActiveRecord < Abstract

data/lib/dynflow/transaction_adapters/none.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
   module TransactionAdapters
     class None < Abstract

data/lib/dynflow/transaction_adapters.rb

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
+
 module Dynflow
   module TransactionAdapters
-
     require 'dynflow/transaction_adapters/abstract'
     require 'dynflow/transaction_adapters/none'
     require 'dynflow/transaction_adapters/active_record'
-
   end
 end

data/lib/dynflow/utils/indifferent_hash.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
   module Utils
     # Heavily inpired by ActiveSupport::HashWithIndifferentAccess,
@@ -84,7 +85,7 @@ module Dynflow
       end
 
       def reverse_merge!(other_hash)
-        replace(reverse_merge( other_hash ))
+        replace(reverse_merge(other_hash))
       end
 
       def replace(other_hash)
@@ -96,9 +97,13 @@ module Dynflow
       end
 
       def stringify_keys!; self end
+
       def deep_stringify_keys!; self end
+
       def stringify_keys; dup end
+
       def deep_stringify_keys; dup end
+
       def to_options!; self end
 
       def select(*args, &block)
@@ -119,6 +124,7 @@ module Dynflow
       end
 
       protected
+
       def convert_key(key)
         key.kind_of?(Symbol) ? key.to_s : key
       end

data/lib/dynflow/utils/priority_queue.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
   module Utils
     # Heavily inspired by rubyworks/pqueue

data/lib/dynflow/utils.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
+
 module Dynflow
   module Utils
-
     require 'dynflow/utils/indifferent_hash'
     require 'dynflow/utils/priority_queue'
 

data/lib/dynflow/version.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
-  VERSION = '1.8.2'
+  VERSION = '1.8.4'
 end

data/lib/dynflow/watchers/memory_consumption_watcher.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
+
 require 'get_process_mem'
 
 module Dynflow
   module Watchers
     class MemoryConsumptionWatcher
-
       attr_reader :memory_limit, :world
 
       def initialize(world, memory_limit, options)

data/lib/dynflow/web/console.rb

@@ -1,9 +1,8 @@
-
 # frozen_string_literal: true
+
 module Dynflow
   module Web
     class Console < Sinatra::Base
-
       set :public_folder, Web.web_dir('assets')
       set :views, Web.web_dir('views')
       set :per_page, 10
@@ -107,7 +106,6 @@ module Dynflow
           redirect(url "/#{plan.id}?notice=#{url_encode('The step does not support cancelling')}")
         end
       end
-
     end
   end
 end

data/lib/dynflow/web/console_helpers.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
   module Web
     module ConsoleHelpers
@@ -36,7 +37,7 @@ module Dynflow
           pretty_value = prettify_value(value)
           <<-HTML
               <pre class="prettyprint lang-yaml">#{h(pretty_value)}</pre>
-            HTML
+          HTML
         else
           ""
         end
@@ -90,7 +91,7 @@ module Dynflow
                 <b>#{h(label)}</b>
             #{value_html}
               </p>
-            HTML
+          HTML
         else
           ""
         end
@@ -177,9 +178,9 @@ module Dynflow
         checkboxes = values.map do |value|
           field_filter = filtering_options[:filters][field]
           checked      = field_filter && field_filter.include?(value)
-          %{<input type="checkbox" name="filters[#{field}][]" value="#{value}" #{ "checked" if checked }/>#{value}}
+          %{<input type="checkbox" name="filters[#{field}][]" value="#{value}" #{"checked" if checked}/>#{value}}
         end.join(' ')
-        out        %= checkboxes
+        out %= checkboxes
         return out
       end
     end

data/lib/dynflow/web/filtering_helpers.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
   module Web
     module FilteringHelpers

data/lib/dynflow/web/world_helpers.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
   module Web
     module WorldHelpers

data/lib/dynflow/web.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'dynflow'
 require 'pp'
 require 'sinatra/base'
@@ -6,11 +7,10 @@ require 'yaml'
 
 module Dynflow
   module Web
-
     def self.setup(&block)
-      console = Sinatra.new(Web::Console) { instance_exec(&block)}
+      console = Sinatra.new(Web::Console) { instance_exec(&block) }
       Rack::Builder.app do
-        run Rack::URLMap.new('/'        => console)
+        run Rack::URLMap.new('/' => console)
       end
     end
 

data/lib/dynflow/web_console.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'dynflow/web'
 
 warn %{"require 'dynflow/web_console'" is deprecated, use "require 'dynflow/web'" instead}

data/lib/dynflow/world/invalidation.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
   class World
     module Invalidation
@@ -116,7 +117,14 @@ module Dynflow
       # @return [Integer] number of invalidated worlds
       def perform_validity_checks
         world_invalidation_result = worlds_validity_check
-        locks_validity_check
+        locks_validity_check.each do |lock|
+          case lock
+          when ::Dynflow::Coordinator::PlanningLock
+            invalidate_planning_lock(lock)
+          when ::Dynflow::Coordinator::ExecutionLock
+            invalidate_execution_lock(lock)
+          end
+        end
         pruned = connector.prune_undeliverable_envelopes(self)
         logger.error("Pruned #{pruned} undeliverable envelopes") unless pruned.zero?
         world_invalidation_result.values.select { |result| result == :invalidated }.size