capistrano_multiconfig_parallel 2.0.0.rc1 → 2.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f293dd460a9b6468a63c41cabe277f8a948b419
-  data.tar.gz: 07307d95d8574a28775a03549afa110d233d730e
+  metadata.gz: c7cc02538db7ad911dd5b61aa6eab9f9d651ac64
+  data.tar.gz: e81e18d1337ccfeae94260e8ed40e2319377f7aa
 SHA512:
-  metadata.gz: 6209f4db889a5a4c29cf83476509405e56f796180f2024f5945057ce633eedbfde0dbcc4048684947aef4c981071cb1fa99caab3bd142672e7a8dc0c0c98f507
-  data.tar.gz: a5231899ad5ded76359d19f625e921114aa4f3dd4aa1dc8046ec1179f398f2eaf94b4cddbcac7ca65bd66c33fc7aa5d86b03a762aa0f629811f6b3ae7f56023c
+  metadata.gz: 4f69ea91b5e891f4bd5186506734582c6d70785650f7ea9c08c9cc091bbe1bc084739084fe5c8a3277d99038f74d206087335714bacdebf2da11c41c8baa74ee
+  data.tar.gz: 4848c50cabcf6a0daa0f72bb9358f81aa49769746c9748e761954510b42c4682f4dbce620943adcdc06047679c39028dfb9fb82c3409376279007add787a6425

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_manager.rb

@@ -6,7 +6,7 @@ module CapistranoMulticonfigParallel
   # manager class that handles workers
   class CelluloidManager
     include CapistranoMulticonfigParallel::BaseActorHelper
-   attr_accessor :jobs, :job_to_worker, :worker_to_job, :job_to_condition, :mutex, :registration_complete, :workers_terminated, :stderr_buffer
+    attr_accessor :jobs, :job_to_worker, :worker_to_job, :job_to_condition, :mutex, :registration_complete, :workers_terminated, :stderr_buffer
 
     attr_reader :worker_supervisor, :workers
     trap_exit :worker_died
@@ -40,11 +40,11 @@ module CapistranoMulticonfigParallel
 
     # call to send an actor
     # a job
-    def delegate_job(job)
+    def delegate_job(job, old_job = "")
       @jobs[job.id] = job
       # debug(@jobs)
       # start work and send it to the background
-      @workers.work(job, Actor.current)
+      @workers.work(job, Actor.current, old_job)
     end
 
     # call back from actor once it has received it's job
@@ -72,6 +72,7 @@ module CapistranoMulticonfigParallel
         wait_task_confirmations
       end
       terminal_show
+      async.check_workers_done?
       condition = @workers_terminated.wait
       until condition.present?
         sleep(0.1) # keep current thread alive
@@ -80,6 +81,17 @@ module CapistranoMulticonfigParallel
       terminal_show
     end
 
+    def check_workers_done?
+      Thread.new do
+        loop do
+          if Actor.current.alive? && all_workers_finished?
+            @workers_terminated.signal('completed')
+            break
+          end
+        end
+      end
+    end
+
     def terminal_show
       Celluloid::Actor[:terminal_server].async.notify_time_change(CapistranoMulticonfigParallel::TerminalTable.topic, type: 'output') if Celluloid::Actor[:terminal_server].alive?
     end
@@ -169,10 +181,10 @@ module CapistranoMulticonfigParallel
         worker = get_worker_for_job(job_id)
         if worker.alive?
           worker.publish_rake_event('approved' => 'yes',
-                                    'action' => 'invoke',
-                                    'job_id' => job.id,
-                                    'task' => task
-                                   )
+          'action' => 'invoke',
+          'job_id' => job.id,
+          'task' => task
+          )
         end
       end
     end
@@ -191,7 +203,7 @@ module CapistranoMulticonfigParallel
 
     def can_tag_staging?
       @job_manager.can_tag_staging? && @job_manager.tag_staging_exists? &&
-        @jobs.find { |_job_id, job| job.stage == 'production' }.blank?
+      @jobs.find { |_job_id, job| job.stage == 'production' }.blank?
     end
 
     def dispatch_new_job(job, options = {})
@@ -201,7 +213,7 @@ module CapistranoMulticonfigParallel
       new_job_options = job.options.except!('id', 'status', 'exit_status').merge('env_options' => job.env_options.merge(env_opts))
       new_job = CapistranoMulticonfigParallel::Job.new(@job_manager, new_job_options.merge(options))
       log_to_file("Trying to DiSPATCH new JOB #{new_job.inspect}")
-      async.delegate_job(new_job) unless job.rolling_back?
+      async.delegate_job(new_job, job) unless job.rolling_back?
     end
 
     # lookup status of job by asking actor running it
@@ -227,6 +239,7 @@ module CapistranoMulticonfigParallel
       job.rollback_changes_to_application
       @worker_to_job.delete(mailbox.address)
       log_to_file("RESTARTING: worker job #{job.inspect} with mailbox #{mailbox.inspect} and #{mailbox.address.inspect} died  for reason:  #{reason}")
+
       dispatch_new_job(job, skip_env_options: true, action: 'deploy:rollback')
     end
   end

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_worker.rb

@@ -26,7 +26,7 @@ module CapistranoMulticonfigParallel
       :job, :manager, :job_id, :app_name, :env_name, :action_name, :env_options, :machine, :socket_connection, :task_argv,
       :rake_tasks, :current_task_number, # tracking tasks
       :successfull_subscription, :subscription_channel, :publisher_channel, # for subscriptions and publishing events
-      :job_termination_condition, :invocation_chain, :filename, :worker_log, :exit_status
+      :job_termination_condition, :invocation_chain, :filename, :worker_log, :exit_status, :old_job
     ]
 
     attr_reader *CapistranoMulticonfigParallel::CelluloidWorker::ATTRIBUTE_LIST
@@ -35,13 +35,14 @@ module CapistranoMulticonfigParallel
     def initialize(*args)
     end
 
-    def work(job, manager)
+    def work(job, manager, old_job)
       @job = job
+      @old_job = old_job
       @job_id = job.id
       @worker_state = job.status
       @manager = manager
       @job_confirmation_conditions = []
-      log_to_file("worker #{@job_id} received #{job.inspect}")
+      log_to_file("worker #{@job_id} received #{job.inspect} and #{old_job.inspect}")
       @subscription_channel = "#{CapistranoSentinel::RequestHooks::PUBLISHER_PREFIX}#{@job_id}"
       @machine = CapistranoMulticonfigParallel::StateMachine.new(@job, Actor.current)
       @manager.setup_worker_conditions(@job)
@@ -60,6 +61,9 @@ module CapistranoMulticonfigParallel
 
     def start_task
       log_to_file("exec worker #{@job_id} starts task and subscribes to #{@subscription_channel}")
+      if @old_job.present? && @old_job.is_a?(CapistranoMulticonfigParallel::Job)
+        @old_job.new_jobs_dispatched << @job.id
+      end
       @socket_connection = CelluloidPubsub::Client.new(actor: Actor.current, enable_debug: debug_websocket?, channel: subscription_channel, log_file_path: websocket_config.fetch('log_file_path', nil))
     end
 
@@ -111,6 +115,7 @@ module CapistranoMulticonfigParallel
 
     def check_gitflow
       return if @job.stage != 'staging' || !@manager.can_tag_staging? || !executed_task?(CapistranoMulticonfigParallel::GITFLOW_TAG_STAGING_TASK)
+      mark_for_dispatching_new_job
       @manager.dispatch_new_job(@job, stage: 'production')
     end
 
@@ -165,7 +170,6 @@ module CapistranoMulticonfigParallel
       log_to_file("worker #{@job_id} triest to transition from #{@machine.state} to  #{name}") unless options[:bundler]
       @machine.go_to_transition(name.to_s, options)
       error_message = "worker #{@job_id} task #{name} failed "
-#      @manager.worker_died(Actor.current, error_message) if job.failed?
       raise(CapistranoMulticonfigParallel::CelluloidWorker::TaskFailed.new(error_message), error_message) if job.failed? # force worker to rollback
     end
 
@@ -178,17 +182,22 @@ module CapistranoMulticonfigParallel
     def finish_worker(exit_status)
       log_to_file("worker #{job_id} tries to terminate with exit_status #{exit_status}")
       @manager.mark_completed_remaining_tasks(@job) if Actor.current.alive?
-      exit_status == 0 ? update_machine_state('FINISHED') : update_machine_state('DEAD')
-#      @manager.worker_died(Actor.current, exit_status) if exit_status != 0
-      @manager.workers_terminated.signal('completed') if @manager.present? && @manager.alive? && @manager.all_workers_finished?
+      update_machine_state('FINISHED') if exit_status == 0
+      @manager.workers_terminated.signal('completed') if !@job.marked_for_dispatching_new_job? && @manager.present? && @manager.alive? && @manager.all_workers_finished?
+    end
+
+    def mark_for_dispatching_new_job
+      @job.will_dispatch_new_job = @job.new_jobs_dispatched.size + 1 unless @job.rolling_back?
     end
 
     def notify_finished(exit_status)
+      mark_for_dispatching_new_job if exit_status != 0
+      @job.exit_status = exit_status
       finish_worker(exit_status)
-       return if exit_status == 0
-       error_message = "worker #{@job_id} task  failed with exit status #{exit_status.inspect}  "
-       raise(CapistranoMulticonfigParallel::CelluloidWorker::TaskFailed.new(error_message), error_message)
-     end
+      return if exit_status == 0
+      error_message = "worker #{@job_id} task  failed with exit status #{exit_status.inspect}  "
+      raise(CapistranoMulticonfigParallel::CelluloidWorker::TaskFailed.new(error_message), error_message)
+    end
 
     # def inspect
     #   to_s

data/lib/capistrano_multiconfig_parallel/celluloid/process_runner.rb

@@ -57,15 +57,15 @@ module CapistranoMulticonfigParallel
     end
 
     def check_exit_status
-      return if @runner_status.exit_status.blank?
+      exit_status = @runner_status.exit_status
+      return if exit_status.blank?
       @timer.cancel
-      @job.exit_status = @runner_status.exit_status
-      log_to_file("worker #{@job_id} startsnotify finished with exit status #{@job.exit_status.inspect}")
+      log_to_file("worker #{@job_id} startsnotify finished with exit status #{exit_status.inspect}")
       if @actor.present? && @actor.respond_to?(:notify_finished)
         if @actor.respond_to?(:async) && @synchronicity == :async
-          @actor.async.notify_finished(@job.exit_status)
+          @actor.async.notify_finished(exit_status)
         elsif @synchronicity == :sync
-          @actor.notify_finished(@job.exit_status)
+          @actor.notify_finished(exit_status)
         end
       end
     end

data/lib/capistrano_multiconfig_parallel/classes/child_process_status.rb

@@ -62,7 +62,6 @@ module CapistranoMulticonfigParallel
 
     def watch_handler(process)
       @process ||= process
-      process_runner.check_exit_status
     end
 
     def io_callback(io, data)

data/lib/capistrano_multiconfig_parallel/classes/job.rb

@@ -6,7 +6,7 @@ module CapistranoMulticonfigParallel
     include CapistranoMulticonfigParallel::ApplicationHelper
 
     attr_reader :options, :application, :manager, :bundler_status
-    attr_writer :status, :exit_status, :bundler_status
+    attr_writer :status, :exit_status,  :bundler_status, :new_jobs_dispatched, :will_dispatch_new_job
 
     delegate :stderr_buffer,
     to: :manager
@@ -80,7 +80,7 @@ module CapistranoMulticonfigParallel
     def worker_state
       worker_obj = worker
       default = status.to_s.upcase.red
-      worker_obj.present? && worker_obj.alive? ? worker_obj.worker_state : default
+      worker_died? ? default : worker_obj.worker_state
     end
 
     def id
@@ -95,7 +95,10 @@ module CapistranoMulticonfigParallel
       { name: 'env_options', default: {} },
       { name: 'path', default: nil },
       { name: 'status', default: :unstarted },
-      { name: 'exit_status', default: nil }
+      { name: 'exit_status', default: nil },
+      { name: 'bundler_status', default: nil },
+      { name: 'new_jobs_dispatched', default: [] },
+      { name: 'will_dispatch_new_job', default: nil },
     ].each do |hash|
       define_method hash[:name] do
         value = @options.fetch(hash[:name], hash[:default])
@@ -123,8 +126,19 @@ module CapistranoMulticonfigParallel
       ['deploy:rollback'].include?(action)
     end
 
+    def marked_for_dispatching_new_job?
+      will_dispatch_new_job.to_i != new_jobs_dispatched.size
+    end
+
+    def new_jobs_dispatched_finished?
+      if marked_for_dispatching_new_job?
+        sleep(0.1) until will_dispatch_new_job.to_i == new_jobs_dispatched.size
+      end
+      true
+    end
+
     def crashed?
-      worker_died? || failed? || dead? || exit_status.present?
+      worker_died? || failed? || exit_status.present?
     end
 
     def dead?
@@ -132,11 +146,11 @@ module CapistranoMulticonfigParallel
     end
 
     def worker_died?
-      worker.blank? || !worker.alive?
+      dead? || worker == nil || worker.dead?
     end
 
     def work_done?
-      finished? || crashed?
+      new_jobs_dispatched_finished? && (finished? || crashed?)
     end
 
     def inspect
@@ -149,8 +163,8 @@ module CapistranoMulticonfigParallel
 
     def to_json
       hash = {}
-      %w(id app stage action task_arguments env_options status exit_status).each do |key|
-        hash[key] = send(key)
+      %w(id app stage action task_arguments env_options status exit_status bundler_status will_dispatch_new_job new_jobs_dispatched).each do |key|
+        hash[key] = send(key).inspect
       end
       hash
     end

data/lib/capistrano_multiconfig_parallel/classes/job_command.rb

@@ -211,11 +211,14 @@ module CapistranoMulticonfigParallel
 
       if rvm_enabled_for_job?
         create_job_tempfile_command(command_text)
+        log_to_file "JOB #{@job_id}  created Tempfile #{@tempfile.path} with contents #{File.read(@tempfile.path)}"
         "ruby #{@tempfile.path}"
       else
-        <<-CMD
+        final_command=<<-CMD
         cd #{job_path} && bundle exec ruby -e "#{command_text}"
         CMD
+        log_to_file "JOB #{@job_id}  prepared command #{final_command}"
+        final_command
       end
     end
 
@@ -224,7 +227,7 @@ module CapistranoMulticonfigParallel
       prepare_application_for_deployment
       #  config_flags = CapistranoMulticonfigParallel.configuration_flags.merge("capistrano_version": job_capistrano_version)
       environment_options = setup_command_line.join(' ')
-      command = "#{fetch_bundler_check_command(@job_final_gemfile)} && WEBSOCKET_LOGGING=#{debug_websocket?} LOG_FILE=#{websocket_config.fetch('log_file_path', nil)} #{bundle_gemfile_env(@job_final_gemfile)} bundle exec cap #{job_stage} #{capistrano_action} #{environment_options}"
+      command = "#{fetch_bundler_check_command(@job_final_gemfile)} && WEBSOCKET_LOGGING=#{true} LOG_FILE=#{websocket_config.fetch('log_file_path', nil)} #{bundle_gemfile_env(@job_final_gemfile)} bundle exec cap #{job_stage} #{capistrano_action} #{environment_options}"
 
       get_command_script(command)
     end
@@ -239,7 +242,7 @@ module CapistranoMulticonfigParallel
     end
 
     def prepare_application_for_deployment
-      if ENV['MULTI_CAP_WEB_APP']
+      if ENV['MULTI_CAP_WEB_APP'].present?
         bundler_worker = CapistranoMulticonfigParallel::BundlerWorker.new
         result = bundler_worker.work(job)
       end

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -10,7 +10,7 @@ module CapistranoMulticonfigParallel
     MAJOR = 2
     MINOR = 0
     TINY = 0
-    PRE = 'rc1'
+    PRE = 'rc2'
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano_multiconfig_parallel
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc1
+  version: 2.0.0.rc2
 platform: ruby
 authors:
 - bogdanRada