dynflow 1.9.3 → 2.0.0

data/test/persistence_test.rb

@@ -342,7 +342,7 @@ module Dynflow
           end
         end
 
-        describe '#find_past_delayed_plans' do
+        describe '#find_ready_delayed_plans' do
           it 'finds plans with start_before in past' do
             start_time = Time.now.utc
             prepare_and_save_plans
@@ -352,7 +352,7 @@ module Dynflow
             adapter.save_delayed_plan('plan3', :execution_plan_uuid => 'plan3', :frozen => false, :start_at => format_time(start_time + 60))
             adapter.save_delayed_plan('plan4', :execution_plan_uuid => 'plan4', :frozen => false, :start_at => format_time(start_time - 60),
                                       :start_before => format_time(start_time - 60))
-            plans = adapter.find_past_delayed_plans(start_time)
+            plans = adapter.find_ready_delayed_plans(start_time)
             _(plans.length).must_equal 3
             _(plans.map { |plan| plan[:execution_plan_uuid] }).must_equal %w(plan2 plan4 plan1)
           end
@@ -366,10 +366,77 @@ module Dynflow
             adapter.save_delayed_plan('plan2', :execution_plan_uuid => 'plan2', :frozen => true, :start_at => format_time(start_time + 60),
                                       :start_before => format_time(start_time - 60))
 
-            plans = adapter.find_past_delayed_plans(start_time)
+            plans = adapter.find_ready_delayed_plans(start_time)
             _(plans.length).must_equal 1
             _(plans.first[:execution_plan_uuid]).must_equal 'plan1'
           end
+
+          it 'finds plans with null start_at' do
+            start_time = Time.now.utc
+            prepare_and_save_plans
+
+            adapter.save_delayed_plan('plan1', :execution_plan_uuid => 'plan1', :frozen => false)
+
+            plans = adapter.find_ready_delayed_plans(start_time)
+            _(plans.length).must_equal 1
+            _(plans.first[:execution_plan_uuid]).must_equal 'plan1'
+          end
+
+          it 'properly stored execution plan dependencies' do
+            prepare_and_save_plans
+
+            adapter.save_delayed_plan('plan1', :execution_plan_uuid => 'plan1', :frozen => false)
+            adapter.chain_execution_plan('plan2', 'plan1')
+            adapter.chain_execution_plan('plan3', 'plan1')
+            dependencies = adapter.find_execution_plan_dependencies('plan1')
+            _(dependencies.to_set).must_equal ['plan2', 'plan3'].to_set
+          end
+
+          it 'does not find blocked plans' do
+            start_time = Time.now.utc
+            prepare_and_save_plans
+
+            adapter.save_delayed_plan('plan1', :execution_plan_uuid => 'plan1', :frozen => false)
+            adapter.chain_execution_plan('plan2', 'plan1')
+            adapter.chain_execution_plan('plan3', 'plan1')
+
+            plans = adapter.find_ready_delayed_plans(start_time)
+            _(plans.length).must_equal 0
+          end
+
+          it 'finds plans which are no longer blocked' do
+            start_time = Time.now.utc
+            prepare_and_save_plans
+
+            adapter.save_delayed_plan('plan1', :execution_plan_uuid => 'plan1', :frozen => false)
+            adapter.chain_execution_plan('plan2', 'plan1')
+
+            plans = adapter.find_ready_delayed_plans(start_time)
+            _(plans.length).must_equal 1
+            _(plans.first[:execution_plan_uuid]).must_equal 'plan1'
+          end
+
+          it 'does not find plans which are no longer blocked but are frozen' do
+            start_time = Time.now.utc
+            prepare_and_save_plans
+
+            adapter.save_delayed_plan('plan1', :execution_plan_uuid => 'plan1', :frozen => true)
+            adapter.chain_execution_plan('plan2', 'plan1')
+
+            plans = adapter.find_ready_delayed_plans(start_time)
+            _(plans.length).must_equal 0
+          end
+
+          it 'does not find plans which are no longer blocked but their start_at is in the future' do
+            start_time = Time.now.utc
+            prepare_and_save_plans
+
+            adapter.save_delayed_plan('plan1', :execution_plan_uuid => 'plan1', :frozen => false, :start_at => start_time + 60)
+            adapter.chain_execution_plan('plan2', 'plan1') # plan2 is already stopped
+
+            plans = adapter.find_ready_delayed_plans(start_time)
+            _(plans.length).must_equal 0
+          end
         end
 
         describe '#delete_output_chunks' do

data/test/support/dummy_example.rb

@@ -31,6 +31,10 @@ module Support
 
     class FailingDummy < Dynflow::Action
       def run; raise 'error'; end
+
+      def rescue_strategy
+        Dynflow::Action::Rescue::Fail
+      end
     end
 
     class Slow < Dynflow::Action

data/test/test_helper.rb

@@ -20,7 +20,9 @@ require 'support/rescue_example'
 require 'support/dummy_example'
 require 'support/test_execution_log'
 
-Concurrent.disable_at_exit_handlers!
+Concurrent.global_logger = lambda do |level, progname, message = nil, &block|
+  ::Dynflow::Testing.logger_adapter.logger.add level, message, progname, &block
+end
 
 # To be able to stop a process in some step and perform assertions while paused
 class TestPause
@@ -109,12 +111,19 @@ module WorldFactory
   # This world survives though the whole run of the test suite: careful with it, it can
   # introduce unnecessary test dependencies
   def self.logger_adapter
-    @adapter ||= Dynflow::LoggerAdapters::Simple.new $stderr, ::Logger::FATAL
+    ::Dynflow::Testing.logger_adapter
   end
 
   def self.persistence_adapter
     @persistence_adapter ||= begin
-                               db_config = ENV['DB_CONN_STRING'] || 'sqlite:/'
+                               db_config = ENV.fetch('DB_CONN_STRING') do
+                                 case ENV['DB']
+                                 when 'postgresql'
+                                   "postgres://postgres@localhost/#{ENV.fetch('POSTGRES_DB', 'ci_test')}"
+                                 else
+                                   'sqlite:/'
+                                 end
+                               end
                                puts "Using database configuration: #{db_config}"
                                Dynflow::PersistenceAdapters::Sequel.new(db_config)
                              end
@@ -127,7 +136,7 @@ module WorldFactory
   def self.clean_coordinator_records
     persistence_adapter = WorldFactory.persistence_adapter
     persistence_adapter.find_coordinator_records({}).each do |w|
-      warn "Unexpected coordinator record: #{w}"
+      ::Dynflow::Testing.logger_adapter.logger.warn "Unexpected coordinator record: #{w}"
       persistence_adapter.delete_coordinator_record(w[:class], w[:id])
     end
   end
@@ -234,12 +243,18 @@ module TestHelpers
 end
 
 class MiniTest::Test
+  def logger
+    ::Dynflow::Testing.logger_adapter.logger
+  end
+
   def setup
+    logger.info(">>>>> #{location}")
     WorldFactory.clean_coordinator_records
   end
 
   def teardown
     WorldFactory.terminate_worlds
+    logger.info("<<<<< #{location}")
   end
 end
 

data/web/views/show.erb

@@ -43,6 +43,30 @@
   <%= h(@plan.ended_at) %>
 </p>
 
+<% dependencies = @plan.world.persistence.find_execution_plan_dependencies(@plan.id) %>
+<% if dependencies.any? %>
+  <p>
+    <b>Depends on execution plans:</b>
+    <ul>
+    <% dependencies.each do |dep_id| %>
+      <li><a href="<%= url("/#{dep_id}") %>"><%= h(dep_id) %></a></li>
+    <% end %>
+    </ul>
+  </p>
+<% end %>
+
+<% blocked_plans = @plan.world.persistence.find_blocked_execution_plans(@plan.id) %>
+<% if blocked_plans.any? %>
+  <p>
+    <b>Blocks execution plans:</b>
+    <ul>
+    <% blocked_plans.each do |dep_id| %>
+      <li><a href="<%= url("/#{dep_id}") %>"><%= h(dep_id) %></a></li>
+    <% end %>
+    </ul>
+  </p>
+<% end %>
+
 <ul class="phases nav nav-tabs" id="myTab">
   <li><a href="#plan">Plan</a></li>
   <li class="active"><a href="#run">Run</a></li>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynflow
 version: !ruby/object:Gem::Version
-  version: 1.9.3
+  version: 2.0.0
 platform: ruby
 authors:
 - Ivan Necas
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.0
-- !ruby/object:Gem::Dependency
-  name: apipie-params
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -331,7 +317,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/install_dependencies.sh"
+- ".github/workflows/bats.yml"
 - ".github/workflows/release.yml"
 - ".github/workflows/ruby.yml"
 - ".gitignore"
@@ -480,6 +466,7 @@ files:
 - examples/chunked_output_benchmark.rb
 - examples/clock_benchmark.rb
 - examples/example_helper.rb
+- examples/execution_plan_chaining.rb
 - examples/future_execution.rb
 - examples/halt.rb
 - examples/memory_limit_watcher.rb
@@ -621,6 +608,7 @@ files:
 - lib/dynflow/persistence_adapters/sequel_migrations/022_store_flows_as_msgpack.rb
 - lib/dynflow/persistence_adapters/sequel_migrations/023_sqlite_workarounds.rb
 - lib/dynflow/persistence_adapters/sequel_migrations/024_store_execution_plan_data_as_msgpack.rb
+- lib/dynflow/persistence_adapters/sequel_migrations/025_create_execution_plan_dependencies.rb
 - lib/dynflow/persistence_adapters/sequel_migrations/msgpack_migration_helper.rb
 - lib/dynflow/rails.rb
 - lib/dynflow/rails/configuration.rb
@@ -676,6 +664,11 @@ files:
 - test/action_test.rb
 - test/activejob_adapter_test.rb
 - test/batch_sub_tasks_test.rb
+- test/bats/helpers/common.bash
+- test/bats/helpers/containers.bash
+- test/bats/setup_suite.bash
+- test/bats/sidekiq-orchestrator.bats
+- test/bats/teardown_suite.bash
 - test/clock_test.rb
 - test/concurrency_control_test.rb
 - test/coordinator_test.rb
@@ -744,7 +737,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -759,6 +752,11 @@ test_files:
 - test/action_test.rb
 - test/activejob_adapter_test.rb
 - test/batch_sub_tasks_test.rb
+- test/bats/helpers/common.bash
+- test/bats/helpers/containers.bash
+- test/bats/setup_suite.bash
+- test/bats/sidekiq-orchestrator.bats
+- test/bats/teardown_suite.bash
 - test/clock_test.rb
 - test/concurrency_control_test.rb
 - test/coordinator_test.rb

data/.github/install_dependencies.sh

@@ -1,35 +0,0 @@
-#!/usr/bin/env bash
-
-set -x
-
-echo "Setting the environment to use ${DB} database"
-
-BUNDLE_CONFIG=.bundle/config
-mkdir -p $(dirname $BUNDLE_CONFIG)
-cat <<EOF > $BUNDLE_CONFIG
----
-BUNDLE_WITHOUT: pry:mysql:postgresql:concurrent_ruby_ext
-EOF
-
-case $DB in
-    mysql)
-        sed -i 's/:mysql//'g $BUNDLE_CONFIG
-    ;;
-    postgresql)
-        sed -i 's/:postgresql//'g $BUNDLE_CONFIG
-    ;;
-    sqlite3)
-        # the tests are by default using sqlite3: do nothing
-    ;;
-    *)
-    echo "Unsupported database ${DB}"
-    exit 1
-    ;;
-esac
-
-if [ "$CONCURRENT_RUBY_EXT" = "true" ]; then
-  echo "Enabling concurrent-ruby-ext"
-  sed -i 's/:concurrent_ruby_ext//'g $BUNDLE_CONFIG
-fi
-gem update bundler
-bundle install