dynflow 1.6.3 → 1.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40e7ab36f1ef2943d1cbebccde747a2c89186a620493a74bfefb06a810e8bf13
-  data.tar.gz: c2d4da5a39382f4df50ac0a1664edab9b772f94fc6da4f7f5eec51c24b91e256
+  metadata.gz: 7d0b1467496599ac3e304bca93b63413aeac7fda0320e16cf5972e33f16d0a02
+  data.tar.gz: e8fe13761a0171e81a134509e5e39bdae5ba8232aa575fedcb24fcdf7bd3094e
 SHA512:
-  metadata.gz: 955818d3401e8641df7ad06ad0307791502437ac3b2549dee9d1161c8dd29d76e83f03b378b6c451547d2e1a00f0b8bbdfa282ea9b6e3fc37005e1fde59ebff6
-  data.tar.gz: 2cb868cab752e95928521d1276bca3091f3ebbd55437e80a82baf980c636880dea3bdb3b345252e2735ffe236960c9d9c6d78a471acc9462c8341581ec91ff98
+  metadata.gz: '080f023d076d02d9025aa16ad97eb4aa0fc815cd731318596cd66fb8ce96e49497ccd5beb427d7aa05b0fcdb3d2f8f744c52af430cdb9b55d2e6cfb4022b9c19'
+  data.tar.gz: e18efbc9ab0110328b54296de3b95906b04757a799efc791cbb8a68564abcb03c76a49c4b716ab7dc4755a489d00b4441f1930faeb466d8e9ed7c12c0265e140

data/lib/dynflow/execution_plan/hooks.rb

@@ -69,7 +69,7 @@ module Dynflow
                 action.send(hook, execution_plan)
               rescue => e
                 execution_plan.logger.error "Failed to run hook '#{hook}' for action '#{action.class}'"
-                execution_plan.logger.debug e
+                execution_plan.logger.error e
               end
             end
           end

data/lib/dynflow/persistence_adapters/sequel_migrations/022_store_flows_as_msgpack.rb

@@ -1,65 +1,9 @@
 # frozen_string_literal: true
 
-require 'json'
-require 'msgpack'
-
-def table_pkeys(table)
-  case table
-  when :dynflow_execution_plans
-    [:uuid]
-  when :dynflow_actions, :dynflow_steps
-    [:execution_plan_uuid, :id]
-  when :dynflow_coordinator_records
-    [:id, :class]
-  when :dynflow_delayed_plans
-    [:execution_plan_uuid]
-  when :dynflow_envelopes
-    [:id]
-  when :dynflow_output_chunks
-    [:chunk]
-  else
-    raise "Unknown table '#{table}'"
-  end
-end
-
-def conditions_for_row(table, row)
-  row.slice(*table_pkeys(table))
-end
-
-def migrate_table(table, from_names, to_names, new_type)
-  alter_table(table) do
-    to_names.each do |new|
-      add_column new, new_type
-    end
-  end
-
-  relevant_columns = table_pkeys(table) | from_names
-
-  from(table).select(*relevant_columns).each do |row|
-    update = from_names.zip(to_names).reduce({}) do |acc, (from, to)|
-      row[from].nil? ? acc : acc.merge(to => yield(row[from]))
-    end
-    next if update.empty?
-    from(table).where(conditions_for_row(table, row)).update(update)
-  end
-
-  from_names.zip(to_names).each do |old, new|
-    alter_table(table) do
-      drop_column old
-    end
-
-    if database_type == :mysql
-      type = new_type == File ? 'blob' : 'mediumtext'
-      run "ALTER TABLE #{table} CHANGE COLUMN `#{new}` `#{old}` #{type};"
-    else
-      rename_column table, new, old
-    end
-  end
-end
+require_relative 'msgpack_migration_helper'
 
 Sequel.migration do
-
-  TABLES = {
+  helper = MsgpackMigrationHelper.new({
     :dynflow_actions => [:data, :input, :output],
     :dynflow_coordinator_records => [:data],
     :dynflow_delayed_plans => [:serialized_args, :data],
@@ -67,24 +11,13 @@ Sequel.migration do
     :dynflow_execution_plans => [:run_flow, :finalize_flow, :execution_history, :step_ids],
     :dynflow_steps => [:error, :children],
     :dynflow_output_chunks => [:chunk]
-  }
+  })
 
   up do
-    TABLES.each do |table, columns|
-      new_columns = columns.map { |c| "#{c}_blob" }
-
-      migrate_table table, columns, new_columns, File do |data|
-        ::Sequel.blob(MessagePack.pack(JSON.parse(data)))
-      end
-    end
+    helper.up(self)
   end
 
   down do
-    TABLES.each do |table, columns|
-      new_columns = columns.map { |c| c + '_text' }
-      migrate_table table, columns, new_columns, String do |data|
-        JSON.dump(MessagePack.unpack(data))
-      end
-    end
+    helper.down(self)
   end
 end

data/lib/dynflow/persistence_adapters/sequel_migrations/024_store_execution_plan_data_as_msgpack.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require_relative 'msgpack_migration_helper'
+
+Sequel.migration do
+  helper = MsgpackMigrationHelper.new({
+    :dynflow_execution_plans => [:data],
+    :dynflow_steps => [:data]
+  })
+
+  up do
+    helper.up(self)
+  end
+
+  down do
+    helper.down(self)
+  end
+end

data/lib/dynflow/persistence_adapters/sequel_migrations/msgpack_migration_helper.rb

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+require 'json'
+require 'msgpack'
+
+class MsgpackMigrationHelper
+  def initialize(tables)
+    @tables = tables
+  end
+
+  def up(migration)
+    @tables.each do |table, columns|
+      new_columns = columns.map { |c| "#{c}_blob" }
+
+      migrate_table migration, table, columns, new_columns, File do |data|
+        ::Sequel.blob(MessagePack.pack(JSON.parse(data)))
+      end
+    end
+  end
+
+  def down(migration)
+    @tables.each do |table, columns|
+      new_columns = columns.map { |c| c + '_text' }
+      migrate_table migration, table, columns, new_columns, String do |data|
+        JSON.dump(MessagePack.unpack(data))
+      end
+    end
+  end
+
+  private
+
+  def migrate_table(migration, table, from_names, to_names, new_type)
+    migration.alter_table(table) do
+      to_names.each do |new|
+        add_column new, new_type
+      end
+    end
+
+    relevant_columns = table_pkeys(table) | from_names
+
+    migration.from(table).select(*relevant_columns).each do |row|
+      update = from_names.zip(to_names).reduce({}) do |acc, (from, to)|
+        row[from].nil? ? acc : acc.merge(to => yield(row[from]))
+      end
+      next if update.empty?
+      migration.from(table).where(conditions_for_row(table, row)).update(update)
+    end
+
+    from_names.zip(to_names).each do |old, new|
+      migration.alter_table(table) do
+        drop_column old
+      end
+
+      if migration.database_type == :mysql
+        type = new_type == File ? 'blob' : 'mediumtext'
+        run "ALTER TABLE #{table} CHANGE COLUMN `#{new}` `#{old}` #{type};"
+      else
+        migration.rename_column table, new, old
+      end
+    end
+  end
+
+  def conditions_for_row(table, row)
+    row.slice(*table_pkeys(table))
+  end
+
+  def table_pkeys(table)
+    case table
+    when :dynflow_execution_plans
+      [:uuid]
+    when :dynflow_actions, :dynflow_steps
+      [:execution_plan_uuid, :id]
+    when :dynflow_coordinator_records
+      [:id, :class]
+    when :dynflow_delayed_plans
+      [:execution_plan_uuid]
+    when :dynflow_envelopes
+      [:id]
+    when :dynflow_output_chunks
+      [:id]
+    else
+      raise "Unknown table '#{table}'"
+    end
+  end
+end

data/lib/dynflow/rails/configuration.rb

@@ -127,7 +127,8 @@ module Dynflow
           db_pool_size = calculate_db_pool_size(world)
           ::ActiveRecord::Base.connection_pool.disconnect!
 
-          config = ::ActiveRecord::Base.configurations[::Rails.env]
+          config = ::ActiveRecord::Base.configurations.configs_for(env_name: ::Rails.env)[0].configuration_hash.dup
+          config = ::Dynflow::Utils::IndifferentHash.new(config)
           config['pool'] = db_pool_size if config['pool'].to_i < db_pool_size
           ::ActiveRecord::Base.establish_connection(config)
         end
@@ -158,7 +159,8 @@ module Dynflow
       protected
 
       def default_sequel_adapter_options(world)
-        db_config            = ::ActiveRecord::Base.configurations[::Rails.env].dup
+        db_config            = ::ActiveRecord::Base.configurations.configs_for(env_name: ::Rails.env)[0].configuration_hash.dup
+        db_config            = ::Dynflow::Utils::IndifferentHash.new(db_config)
         db_config['adapter'] = db_config['adapter'].gsub(/_?makara_?/, '')
         db_config['adapter'] = 'postgres' if db_config['adapter'] == 'postgresql'
         db_config['max_connections'] = calculate_db_pool_size(world) if increase_db_pool_size?

data/lib/dynflow/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynflow
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.6
 platform: ruby
 authors:
 - Ivan Necas
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-20 00:00:00.000000000 Z
+date: 2022-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -547,6 +547,8 @@ files:
 - lib/dynflow/persistence_adapters/sequel_migrations/021_create_output_chunks.rb
 - 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/msgpack_migration_helper.rb
 - lib/dynflow/rails.rb
 - lib/dynflow/rails/configuration.rb
 - lib/dynflow/rails/daemon.rb
@@ -676,7 +678,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: DYNamic workFLOW engine