dynflow 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 727176abc78b46f7b0f0381806561496fba8cdb9e31c5cdea473b5bd6de7bcf0
-  data.tar.gz: aa1d255d09123e50d1d7c718c4738e87fa88741ad23e1f548f0444bdb98fc534
+  metadata.gz: dfb6db078bac6d7bb006fa9cdc7ccb30a5eaa507d5c5fde11723c5295fe7990c
+  data.tar.gz: 7959053035ed970863493c066622e51ca16733d17be8869458ef79c6ccfe4244
 SHA512:
-  metadata.gz: 98f12bd5c1cd06b925601b6c9e6fc5dda7f2f81ecba805251cfb987c9b131bd88be59f57098d8bab4c856b33743815fa2338524ffe3804d4d1dda0e44f73fadc
-  data.tar.gz: 8747b3e08c259a94dd025acb4cfc97654ff8c1ec5782b8bf7876b455187fb789f91d467e1ca9468e48c1a16d745fe3279911652f669b84f4864df8af3066b3cf
+  metadata.gz: 219901624a304846e8d8b3e70e274e2b291923db9f43ae482816b02caa3b967985fc75f936283e5647f98415d788235e7521ac26f28b59dde625084ed9599bf5
+  data.tar.gz: d1a32c183a574de8e3a0aeeb875bafa6082f2a2971a0f8755f441ab5d350cba2de19e2df22c93109335244f8e84ac65b5dc100abd3517c098bc37e7231751ce2

data/.travis.yml

@@ -2,6 +2,7 @@ language: ruby
 
 services:
   - postgresql
+  - redis
 
 rvm:
   - "2.3.1"
@@ -18,6 +19,7 @@ matrix:
       env: "DB=mysql DB_CONN_STRING=mysql2://root@localhost/travis_ci_test"
       services:
         - mysql
+        - redis
     - rvm: "2.4.0"
       env: "DB=sqlite3 DB_CONN_STRING=sqlite:/"
     - rvm: "2.4.0"

data/dynflow.gemspec

@@ -30,6 +30,7 @@ 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 "minitest-stub-const"
   s.add_development_dependency "activerecord"
   s.add_development_dependency 'activejob'
   s.add_development_dependency "sqlite3"

data/lib/dynflow/persistence_adapters/sequel_migrations/001_initial.rb

@@ -32,7 +32,8 @@ Sequel.migration do
       primary_key [:execution_plan_uuid, :id]
       index [:execution_plan_uuid, :id], :unique => true
       column :action_id, Integer
-      foreign_key [:execution_plan_uuid, :action_id], :dynflow_actions
+      foreign_key [:execution_plan_uuid, :action_id], :dynflow_actions,
+                  name: :dynflow_steps_execution_plan_uuid_fkey1
       index [:execution_plan_uuid, :action_id]
 
       column :data, String, text: true

data/lib/dynflow/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Dynflow
-  VERSION = '1.4.1'
+  VERSION = '1.4.2'
 end

data/test/redis_locking_test.rb

@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+require_relative 'test_helper'
+require 'mocha/minitest'
+require 'minitest/stub_const'
+require 'ostruct'
+require 'sidekiq'
+require 'dynflow/executors/sidekiq/core'
+
+module Dynflow
+  module RedisLockingTest
+    describe Executors::Sidekiq::RedisLocking do
+      class Orchestrator
+        include Executors::Sidekiq::RedisLocking
+
+        attr_accessor :logger
+
+        def initialize(world, logger)
+          @world = world
+          @logger = logger
+        end
+      end
+
+      class Logger
+        attr_reader :logs
+        def initialize
+          @logs = []
+        end
+
+        [:info, :error, :fatal].each do |key|
+          define_method key do |message|
+            @logs << [key, message]
+          end
+        end
+      end
+
+      after do
+        ::Sidekiq.redis do |conn|
+          conn.del Executors::Sidekiq::RedisLocking::REDIS_LOCK_KEY
+        end
+      end
+
+      def redis_orchestrator_id
+        ::Sidekiq.redis do |conn|
+          conn.get Executors::Sidekiq::RedisLocking::REDIS_LOCK_KEY
+        end
+      end
+
+      let(:world)  { OpenStruct.new(:id => '12345') }
+      let(:world2) { OpenStruct.new(:id => '67890') }
+      let(:orchestrator)  { Orchestrator.new(world, Logger.new) }
+      let(:orchestrator2) { Orchestrator.new(world2, Logger.new) }
+
+      it 'acquires the lock when it is not taken' do
+        orchestrator.wait_for_orchestrator_lock
+        logs = orchestrator.logger.logs
+        _(redis_orchestrator_id).must_equal world.id
+        _(logs).must_equal [[:info, 'Acquired orchestrator lock, entering active mode.']]
+      end
+
+      it 'reacquires the lock if it was lost' do
+        orchestrator.reacquire_orchestrator_lock
+        logs = orchestrator.logger.logs
+        _(redis_orchestrator_id).must_equal world.id
+        _(logs).must_equal [[:error, 'The orchestrator lock was lost, reacquired']]
+      end
+
+      it 'terminates the process if lock was stolen' do
+        orchestrator.wait_for_orchestrator_lock
+        Process.expects(:kill)
+        orchestrator2.reacquire_orchestrator_lock
+        logs = orchestrator2.logger.logs
+        _(redis_orchestrator_id).must_equal world.id
+        _(logs).must_equal [[:fatal, 'The orchestrator lock was stolen by 12345, aborting.']]
+      end
+
+      it 'polls for the lock availability' do
+        Executors::Sidekiq::RedisLocking.stub_const(:REDIS_LOCK_TTL, 1) do
+          Executors::Sidekiq::RedisLocking.stub_const(:REDIS_LOCK_POLL_INTERVAL, 0.5) do
+            orchestrator.wait_for_orchestrator_lock
+            _(redis_orchestrator_id).must_equal world.id
+            orchestrator2.wait_for_orchestrator_lock
+          end
+        end
+
+        _(redis_orchestrator_id).must_equal world2.id
+        passive, active = orchestrator2.logger.logs
+        _(passive).must_equal [:info, 'Orchestrator lock already taken, entering passive mode.']
+        _(active).must_equal [:info, 'Acquired orchestrator lock, entering active mode.']
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynflow
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Ivan Necas
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-25 00:00:00.000000000 Z
+date: 2019-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -151,6 +151,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-stub-const
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -566,6 +580,7 @@ files:
 - test/middleware_test.rb
 - test/persistence_test.rb
 - test/prepare_travis_env.sh
+- test/redis_locking_test.rb
 - test/rescue_test.rb
 - test/round_robin_test.rb
 - test/semaphores_test.rb
@@ -648,6 +663,7 @@ test_files:
 - test/middleware_test.rb
 - test/persistence_test.rb
 - test/prepare_travis_env.sh
+- test/redis_locking_test.rb
 - test/rescue_test.rb
 - test/round_robin_test.rb
 - test/semaphores_test.rb