foreman-tasks 6.0.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a31c8423a352c5eeb6ff93b23ce8ed3d868ee4bdb16d456233f2c3df475342cd
-  data.tar.gz: c181fdc4c13d8c3cfb7e8d8469c9188a8972b97ca223e68cb50d9a901e23d552
+  metadata.gz: 7fe4afd0fbe9eaa5cb5587310ddddd1538453e733b48b6f927e6bc14fa4ad42e
+  data.tar.gz: 27591131ac0329e66625a15c4b512fa7a24b23b3623abdc1eaef40fee7bdea9a
 SHA512:
-  metadata.gz: c7f2b880bb70b4fc2781ab9c5bff2c7bcd0434bc067669fae601f1815f6720e7dd771a170cdde8a4922565f1bd87c61d5b3dc1c0b10192bd895508d123aa84da
-  data.tar.gz: a4652958efa52fec83b6c0a8093914b1d22ad574bc4763cb66c3bc41e82bd67e5b1448be0fd79ae3ce64225cb44d6c25faeb324cd10a846dfbe77abee5d55b02
+  metadata.gz: 042c221e1f3c01b2d38b2011165479282165846d9b46923b5ef7cc4fc8f91c3ab6ff5921bd229a4a26dbf661dccff3a9d0f0d474e11eb18b074880fc8fc25870
+  data.tar.gz: 4fdf7dfc1836bd8b4ea0490f8c7a894569c7ccf9eca811945b517f7aedface6b04c0c6bbe9c7f34a7b7bbea77328edaadd27ebb624bc29c4acae2eb86bc25624

data/.github/workflows/ruby_tests.yml

@@ -4,6 +4,7 @@ env:
   RAILS_ENV: test
   DATABASE_URL: postgresql://postgres:@localhost/test
   DATABASE_CLEANER_ALLOW_REMOTE_DATABASE_URL: true
+  BUNDLE_WITHOUT: "journald:development:console:mysql2:sqlite:libvirt"
 jobs:
   rubocop:
     runs-on: ubuntu-latest
@@ -13,10 +14,7 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: 2.7
-      - name: Setup
-        run: |
-          gem install bundler
-          bundle install --jobs=3 --retry=3
+          bundler-cache: true
       - name: Run rubocop
         run: bundle exec rubocop
   test_ruby:
@@ -43,30 +41,21 @@ jobs:
       - uses: actions/checkout@v2
         with:
           path: foreman-tasks
+      - name: Setup Plugin in Foreman
+        run: |
+          echo "gem 'foreman-tasks', path: './foreman-tasks'" > bundler.d/foreman-tasks.local.rb
+          echo "gem 'sqlite3'" >> bundler.d/foreman-tasks.local.rb
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
       - name: Setup Node
         uses: actions/setup-node@v1
         with:
           node-version:  ${{ matrix.node-version }}
-      - uses: actions/cache@v2
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-fgems-${{ matrix.ruby-version }}-${{ hashFiles('Gemfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-fgems-${{ matrix.ruby-version }}-
-      - name: Setup Bundler
-        run: |
-          echo "gem 'foreman-tasks', path: './foreman-tasks'" > bundler.d/foreman-tasks.local.rb
-          echo "gem 'sqlite3'" >> bundler.d/foreman-tasks.local.rb
-          gem install bundler
-          bundle config set without journald development console libvirt
-          bundle config set path vendor/bundle
       - name: Prepare test env
         run: |
-          bundle install --jobs=3 --retry=3
           bundle exec rake db:create
           bundle exec rake db:migrate
       - name: Run plugin tests

data/.rubocop.yml

@@ -9,6 +9,7 @@ AllCops:
   Exclude:
     - 'node_modules/**/*'
     - 'locale/*'
+    - 'vendor/**/*'
   TargetRubyVersion: 2.5
 
 Lint/ShadowingOuterLocalVariable:

data/app/controllers/foreman_tasks/tasks_controller.rb

@@ -4,6 +4,8 @@ module ForemanTasks
     include Foreman::Controller::CsvResponder
     include ForemanTasks::FindTasksCommon
 
+    before_action :find_dynflow_task, only: [:unlock, :force_unlock, :cancel, :cancel_step, :resume]
+
     def show
       @task = resource_base.find(params[:id])
       render :layout => !request.xhr?
@@ -31,8 +33,7 @@ module ForemanTasks
     end
 
     def cancel_step
-      task = find_dynflow_task
-      result = ForemanTasks.dynflow.world.event(task.external_id, params[:step_id].to_i, ::Dynflow::Action::Cancellable::Cancel).wait
+      result = ForemanTasks.dynflow.world.event(@dynflow_task.external_id, params[:step_id].to_i, ::Dynflow::Action::Cancellable::Cancel).wait
       if result.rejected?
         render json: { error: result.reason }, status: :bad_request
       else
@@ -41,8 +42,7 @@ module ForemanTasks
     end
 
     def cancel
-      task = find_dynflow_task
-      if task.cancel
+      if @dynflow_task.cancel
         render json: { statusText: 'OK' }
       else
         render json: {}, status: :bad_request
@@ -50,19 +50,17 @@ module ForemanTasks
     end
 
     def abort
-      task = find_dynflow_task
-      if task.abort
+      if @dynflow_task.abort
         flash[:info] = _('Trying to abort the task')
       else
         flash[:warning] = _('The task cannot be aborted at the moment.')
       end
-      redirect_back(:fallback_location => foreman_tasks_task_path(task))
+      redirect_back(:fallback_location => foreman_tasks_task_path(@dynflow_task))
     end
 
     def resume
-      task = find_dynflow_task
-      if task.resumable?
-        ForemanTasks.dynflow.world.execute(task.execution_plan.id)
+      if @dynflow_task.resumable?
+        ForemanTasks.dynflow.world.execute(@dynflow_task.execution_plan.id)
         render json: { statusText: 'OK' }
       else
         render json: {}, status: :bad_request
@@ -70,10 +68,8 @@ module ForemanTasks
     end
 
     def unlock
-      task = find_dynflow_task
-      if task.paused?
-        task.state = :stopped
-        task.save!
+      if @dynflow_task.paused?
+        unlock_task(@dynflow_task)
         render json: { statusText: 'OK' }
       else
         render json: {}, status: :bad_request
@@ -81,9 +77,7 @@ module ForemanTasks
     end
 
     def force_unlock
-      task       = find_dynflow_task
-      task.state = :stopped
-      task.save!
+      unlock_task(@dynflow_task)
       render json: { statusText: 'OK' }
     end
 
@@ -98,6 +92,12 @@ module ForemanTasks
 
     private
 
+    def unlock_task(task)
+      task.state = :stopped
+      task.locks.destroy_all
+      task.save!
+    end
+
     def respond_with_tasks(scope)
       @tasks = filter(scope, paginate: false).with_duration
       csv_response(@tasks, [:id, :action, :state, :result, 'started_at.in_time_zone', 'ended_at.in_time_zone', :duration, :username], ['Id', 'Action', 'State', 'Result', 'Started At', 'Ended At', 'Duration', 'User'])
@@ -123,7 +123,7 @@ module ForemanTasks
     end
 
     def find_dynflow_task
-      resource_scope.where(:type => 'ForemanTasks::Task::DynflowTask').find(params[:id])
+      @dynflow_task = resource_scope.where(:type => 'ForemanTasks::Task::DynflowTask').find(params[:id])
     end
 
     def filter(scope, paginate: true)

data/app/lib/actions/trigger_proxy_batch.rb

@@ -40,7 +40,8 @@ module Actions
         output[:planned_count] += group.size
       end
     rescue => e
-      action_logger.warn "Could not trigger task on the smart proxy: #{e.message}"
+      action_logger.warn "Could not trigger task on the smart proxy"
+      action_logger.warn e
       batch.each { |remote_task| remote_task.update_from_batch_trigger({}) }
       output[:failed_count] += batch.size
     end

data/app/models/foreman_tasks/remote_task.rb

@@ -18,7 +18,8 @@ module ForemanTasks
       response = begin
                    proxy.launch_tasks('single', :action_class => proxy_action_name, :action_input => input)
                  rescue RestClient::Exception => e
-                   logger.warn "Could not trigger task on the smart proxy: #{e.message}"
+                   logger.warn "Could not trigger task on the smart proxy"
+                   logger.warn e
                    {}
                  end
       update_from_batch_trigger(response)
@@ -26,13 +27,13 @@ module ForemanTasks
     end
 
     def self.batch_trigger(operation, remote_tasks)
-      remote_tasks.group_by(&:proxy_url).values.map do |group|
+      remote_tasks.group_by(&:proxy_url).each_value do |group|
         input_hash = group.reduce({}) do |acc, remote_task|
           acc.merge(remote_task.execution_plan_id => { :action_input => remote_task.proxy_input,
                                                        :action_class => remote_task.proxy_action_name })
         end
-        results = remote_tasks.first.proxy.launch_tasks(operation, input_hash)
-        remote_tasks.each do |remote_task|
+        results = group.first.proxy.launch_tasks(operation, input_hash)
+        group.each do |remote_task|
           remote_task.update_from_batch_trigger results.fetch(remote_task.execution_plan_id, {}),
                                                 results.fetch('parent', {})
         end

data/lib/foreman_tasks/tasks/export_tasks.rake

@@ -241,35 +241,42 @@ namespace :foreman_tasks do
       end
     end
 
-    def csv_export(export_filename, tasks)
+    def csv_export(export_filename, id_scope, task_scope)
       CSV.open(export_filename, 'wb') do |csv|
         csv << %w[id state type label result parent_task_id started_at ended_at duration]
-        tasks.find_each do |task|
-          with_error_handling(task) do
-            csv << [task.id, task.state, task.type, task.label, task.result,
-                    task.parent_task_id, task.started_at, task.ended_at, task.duration]
+        id_scope.pluck(:id).each_slice(1000).each do |ids|
+          task_scope.where(id: ids).each do |task|
+            with_error_handling(task) do
+              csv << [task.id, task.state, task.type, task.label, task.result,
+                      task.parent_task_id, task.started_at, task.ended_at, task.duration]
+            end
           end
         end
       end
     end
 
-    def html_export(workdir, tasks)
+    def html_export(workdir, id_scope, task_scope)
       PageHelper.copy_assets(workdir)
 
+      ids = id_scope.pluck(:id)
       renderer = TaskRender.new
-      total = tasks.count(:all)
+      count = 0
+      total = ids.count
       index = File.open(File.join(workdir, 'index.html'), 'w')
 
       File.open(File.join(workdir, 'index.html'), 'w') do |index|
         PageHelper.pagify(index) do |io|
           PageHelper.generate_with_index(io) do |index|
-            tasks.find_each.each_with_index do |task, count|
-              content = with_error_handling(task) { renderer.render_task(task) }
-              if content
-                File.open(File.join(workdir, "#{task.id}.html"), 'w') { |file| PageHelper.pagify(file, content) }
-                with_error_handling(task, _('task index entry')) { PageHelper.generate_index_entry(index, task) }
+            ids.each_slice(1000).each do |ids|
+              task_scope.where(id: ids).each do |task|
+                content = with_error_handling(task) { renderer.render_task(task) }
+                if content
+                  File.open(File.join(workdir, "#{task.id}.html"), 'w') { |file| PageHelper.pagify(file, content) }
+                  with_error_handling(task, _('task index entry')) { PageHelper.generate_index_entry(index, task) }
+                end
+                count += 1
+                puts "#{count}/#{total}"
               end
-              puts "#{count + 1}/#{total}"
             end
           end
         end
@@ -317,21 +324,22 @@ namespace :foreman_tasks do
     format = ENV['TASK_FORMAT'] || 'html'
     export_filename = ENV['TASK_FILE'] || generate_filename(format)
 
-    tasks = ForemanTasks::Task.search_for(filter).order(:started_at => :desc).with_duration.distinct
+    task_scope = ForemanTasks::Task.search_for(filter).with_duration.order(:started_at => :desc)
+    id_scope = task_scope.group(:id, :started_at)
 
     puts _("Exporting all tasks matching filter #{filter}")
-    puts _("Gathering #{tasks.count(:all)} tasks.")
+    puts _("Gathering #{id_scope.count(:all).count} tasks.")
     case format
     when 'html'
       Dir.mktmpdir('task-export') do |tmp_dir|
-        html_export(tmp_dir, tasks)
+        html_export(tmp_dir, id_scope, task_scope)
         system("tar", "czf", export_filename, tmp_dir)
       end
     when 'html-dir'
       FileUtils.mkdir_p(export_filename)
-      html_export(export_filename, tasks)
+      html_export(export_filename, id_scope, task_scope)
     when 'csv'
-      csv_export(export_filename, tasks)
+      csv_export(export_filename, id_scope, task_scope)
     else
       raise "Unkonwn export format '#{format}'"
     end

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = '6.0.0'.freeze
+  VERSION = '6.0.1'.freeze
 end

data/locale/action_names.rb

@@ -1,6 +1,5 @@
 # Autogenerated!
-_("Preupgrade job")
-_("Remote action:")
 _("Import Puppet classes")
 _("Import facts")
-_("Action with sub plans")
+_("Action with sub plans")
+_("Remote action:")

data/locale/en/foreman_tasks.po

@@ -56,6 +56,9 @@ msgstr ""
 msgid "A paused task represents a process that has not finished properly. Any task in paused state can lead to potential inconsistency and needs to be resolved."
 msgstr ""
 
+msgid "A special label for tracking a recurring job. There can be only one active job with a given purpose at a time."
+msgstr ""
+
 msgid "Action"
 msgstr ""
 
@@ -68,6 +71,9 @@ msgstr ""
 msgid "Active Filters:"
 msgstr ""
 
+msgid "Active or disabled recurring logic with purpose %s already exists"
+msgstr ""
+
 msgid "All %s tasks are selected. "
 msgstr ""
 
@@ -276,6 +282,9 @@ msgstr ""
 msgid "Fri"
 msgstr ""
 
+msgid "I understand that this may cause harm and have working database backups of all backend services."
+msgstr ""
+
 msgid "ID"
 msgstr ""
 
@@ -427,9 +436,6 @@ msgstr ""
 msgid "Polling multiplier which is used to multiply the default polling intervals. This can be used to prevent polling too frequently for long running tasks."
 msgstr ""
 
-msgid "Preupgrade job"
-msgstr ""
-
 msgid "Proxy action retry count"
 msgstr ""
 
@@ -442,6 +448,9 @@ msgstr ""
 msgid "Proxy tasks batch size"
 msgstr ""
 
+msgid "Purpose"
+msgstr ""
+
 msgid "Raw"
 msgstr ""
 
@@ -487,6 +496,9 @@ msgstr ""
 msgid "Resource search_params requires resource_type and resource_id to be specified"
 msgstr ""
 
+msgid "Resources for %s task(s) will be unlocked and will not prevent other tasks from being run. As the task(s) might be still running, it should be avoided to use this unless you are really sure the task(s) got stuck."
+msgstr ""
+
 msgid "Result"
 msgstr ""
 
@@ -663,6 +675,12 @@ msgstr[1] ""
 msgid "This action will delete all cancelled recurring logics. Please note that this action can't be reversed."
 msgstr ""
 
+msgid "This will %(action)s %(number)s task(s), putting them in the %(state)s state. Are you sure?"
+msgstr ""
+
+msgid "This will unlock the resources that the task is running against. Please note that this might lead to inconsistent state and should be used with caution, after making sure that the task can't be resumed."
+msgstr ""
+
 msgid "Thu"
 msgstr ""
 
@@ -717,6 +735,9 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
+msgid "You can find resource locks on this page. Exclusive lock marked with locked icon means that no other task can use locked resource while this task is running. Non-exclusive lock marked with unlocked icon means other tasks can access the resource freely, it is only used to indicate the relation of this task with the resource"
+msgstr ""
+
 msgid "You do not have permission"
 msgstr ""
 
@@ -758,6 +779,9 @@ msgstr ""
 msgid "is month (range: 1-12)"
 msgstr ""
 
+msgid "is not a valid format"
+msgstr ""
+
 msgid "last"
 msgstr ""