foreman-tasks 0.15.4 → 0.15.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a46a9b83e2940388c697cb6f0d2d4412ab2f324ab35c6996e61e75128f40e9d
-  data.tar.gz: 39ab0d32e58bbbefd08850f846dcfb845d5a9aa646c4ecf6477b9db19bbd7a5c
+  metadata.gz: 2b8139a15057de700208b9ce91c4c69b7314d48f51e6a402b6eb6fce9876e7d0
+  data.tar.gz: 637f5a6e7df839f77b036a4bd417946ed7df1c711429bca9b0e9a1fbd3c5fc40
 SHA512:
-  metadata.gz: 508b95686e4d405baca1405226482f475bb57933773e349fbd301f0ec84f4a111be1564d34e7b9fff83b4f1d30f1a8bca2da332c349e2d37d9cb5fd252239a1e
-  data.tar.gz: 595b0e0dec575616dd328c297fd8e7efad94aef1e304f365e4b683a8cf04f53b77a517ee42fb85100b7ca44a2b6e9827350f5f38acec00262fad263b52b42a8a
+  metadata.gz: b40833091cd03018255226939b9828b9b6c987e11e5ff2068e98ebeff903870266f1105fb1e8b4742ffd8adbddf62ca5adb4f05b4375f95cf3c40c1b37c8d823
+  data.tar.gz: 1a57a601e73f39b98f4db7326ec5547a7efef245a32bcc4df3816462b39ebf98f6463bd7e066eb75c8dd2e53c28eea6b1591d7780fdc0614245b77beb792d22e

data/extra/dynflow-debug.sh

@@ -31,9 +31,9 @@ add_files /var/log/foreman/dynflow_executor*.output*
 # Foreman Tasks fast export (Postgresql only; for HTML version use foreman-rake foreman_tasks:export_tasks)
 
 if [ "$FOREMAN_DB_ADAPTER" == "postgresql" ]; then
-    export_csv "select dynflow_execution_plans.* from foreman_tasks_tasks join dynflow_execution_plans on (foreman_tasks_tasks.external_id = dynflow_execution_plans.uuid) where foreman_tasks_tasks.started_at > 'now'::timestamp - '${DYNFLOW_EXPORT_MONTHS:-1} months'::interval limit ${DYNFLOW_EXPORT_LIMIT:-100000}" "$DIR/dynflow_execution_plans.csv"
-    export_csv "select dynflow_actions.* from foreman_tasks_tasks join dynflow_actions on (foreman_tasks_tasks.external_id = dynflow_actions.execution_plan_uuid) where foreman_tasks_tasks.started_at > 'now'::timestamp - '${DYNFLOW_EXPORT_MONTHS:-1} months'::interval limit ${DYNFLOW_EXPORT_LIMIT:-100000}" "$DIR/dynflow_actions.csv"
-    export_csv "select dynflow_steps.* from foreman_tasks_tasks join dynflow_steps on (foreman_tasks_tasks.external_id = dynflow_steps.execution_plan_uuid) where foreman_tasks_tasks.started_at > 'now'::timestamp - '${DYNFLOW_EXPORT_MONTHS:-1} months'::interval limit ${DYNFLOW_EXPORT_LIMIT:-100000}" "$DIR/dynflow_steps.csv"
+    export_csv "select dynflow_execution_plans.* from foreman_tasks_tasks join dynflow_execution_plans on (foreman_tasks_tasks.external_id = dynflow_execution_plans.uuid::varchar) where foreman_tasks_tasks.started_at > 'now'::timestamp - '${DYNFLOW_EXPORT_MONTHS:-1} months'::interval limit ${DYNFLOW_EXPORT_LIMIT:-100000}" "$DIR/dynflow_execution_plans.csv"
+    export_csv "select dynflow_actions.* from foreman_tasks_tasks join dynflow_actions on (foreman_tasks_tasks.external_id = dynflow_actions.execution_plan_uuid::varchar) where foreman_tasks_tasks.started_at > 'now'::timestamp - '${DYNFLOW_EXPORT_MONTHS:-1} months'::interval limit ${DYNFLOW_EXPORT_LIMIT:-100000}" "$DIR/dynflow_actions.csv"
+    export_csv "select dynflow_steps.* from foreman_tasks_tasks join dynflow_steps on (foreman_tasks_tasks.external_id = dynflow_steps.execution_plan_uuid::varchar) where foreman_tasks_tasks.started_at > 'now'::timestamp - '${DYNFLOW_EXPORT_MONTHS:-1} months'::interval limit ${DYNFLOW_EXPORT_LIMIT:-100000}" "$DIR/dynflow_steps.csv"
     export_csv "select * from dynflow_schema_info" "$DIR/dynflow_schema_info.csv"
     export_csv "select * from foreman_tasks_tasks limit ${DYNFLOW_EXPORT_LIMIT:-100000}" "$DIR/foreman_tasks_tasks.csv"
 fi

data/lib/foreman_tasks/cleaner.rb

@@ -192,9 +192,15 @@ module ForemanTasks
     end
 
     def orphaned_dynflow_tasks
+      dynflow_plan_uuid_attribute = "dynflow_execution_plans.uuid"
+      if ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
+        # typecast the UUID attribute for Postgres
+        dynflow_plan_uuid_attribute += "::varchar"
+      end
+
       db = ForemanTasks.dynflow.world.persistence.adapter.db
       db.fetch("select dynflow_execution_plans.uuid from dynflow_execution_plans left join "\
-               "foreman_tasks_tasks on (dynflow_execution_plans.uuid = foreman_tasks_tasks.external_id) "\
+               "foreman_tasks_tasks on (#{dynflow_plan_uuid_attribute} = foreman_tasks_tasks.external_id) "\
                "where foreman_tasks_tasks.id IS NULL")
     end
 

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = '0.15.4'.freeze
+  VERSION = '0.15.5'.freeze
 end

data/test/unit/cleaner_test.rb

@@ -32,6 +32,27 @@ class TasksTest < ActiveSupport::TestCase
                   .find_execution_plans(filters: { 'uuid' => tasks_to_keep.map(&:external_id) }).size.must_equal tasks_to_keep.size
     end
 
+    describe "#orphaned_dynflow_tasks" do
+      # We can't use transactional tests because we're using Sequel for the cleanup query
+      self.use_transactional_tests = false
+      before do
+        skip "Sqlite is running testing Dynlfow DB in memory" if ActiveRecord::Base.connection.adapter_name == 'SQLite'
+        @existing_task = FactoryBot.create(:dynflow_task, :user_create_task)
+        @missing_task = FactoryBot.create(:dynflow_task, :user_create_task)
+        @cleaner = ForemanTasks::Cleaner.new(filter: "id ^ (#{@existing_task.id}, #{@missing_task.id})")
+        @missing_task.destroy
+      end
+
+      after do
+        @cleaner.delete if @cleaner
+      end
+
+      it 'is able to find orphaned execution plans (without corresponding task object)' do
+        assert(@cleaner.orphaned_dynflow_tasks.any? { |t| t[:uuid] == @missing_task.external_id })
+        assert_not(@cleaner.orphaned_dynflow_tasks.any? { |t| t[:uuid] == @existing_task.external_id })
+      end
+    end
+
     it 'deletes all tasks matching the filter when the time limit is not specified' do
       cleaner = ForemanTasks::Cleaner.new(:filter => 'label = "Actions::User::Create"')
       tasks_to_delete = [FactoryBot.create(:dynflow_task, :user_create_task),

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 0.15.4
+  version: 0.15.5
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-06 00:00:00.000000000 Z
+date: 2019-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks-core
@@ -232,7 +232,6 @@ files:
 - db/migrate/20180216092715_use_uuid.rb
 - db/migrate/20181019135324_add_remote_task_operation.rb
 - db/migrate/20190318153925_add_task_state_updated_at.foreman_tasks.rb
-- db/migrate/20190404132157_add_implicit_varchar_uuid_cast.rb
 - db/seeds.d/20-foreman_tasks_permissions.rb
 - db/seeds.d/30-notification_blueprints.rb
 - db/seeds.d/60-dynflow_proxy_feature.rb

data/db/migrate/20190404132157_add_implicit_varchar_uuid_cast.rb

@@ -1,25 +0,0 @@
-class AddImplicitVarcharUuidCast < ActiveRecord::Migration[5.2]
-  def up
-    if on_postgresql?
-      ActiveRecord::Base.connection.execute <<~SQL
-        CREATE CAST (varchar AS uuid)
-        WITH INOUT
-        AS IMPLICIT
-      SQL
-    end
-  end
-
-  def down
-    if on_postgresql?
-      ActiveRecord::Base.connection.execute <<~SQL
-        DROP CAST (varchar AS uuid)
-      SQL
-    end
-  end
-
-  private
-
-  def on_postgresql?
-    ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
-  end
-end