capistrano_multiconfig_parallel 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ccbcbb8b3f6f253696e7c0f5c4da3a6c86406e9
-  data.tar.gz: 42654d0b3a82c272c861d9db8ec1a06ed8cddedd
+  metadata.gz: ebf7abf008cd1254ba273dc97467920cbb2be773
+  data.tar.gz: 91ed0dd95fafd3fc453ade3d653c575ddab0a13e
 SHA512:
-  metadata.gz: c16fa1a27b1f804f35b16384a99a98137a70d1624d3d862c426b0f2ee812e9e8c9da9f7dcd0b49cddc7cd614b859df3f13d9c2e5cd2908e6c1627e99c2e7bd3e
-  data.tar.gz: 7174e0d08f121447676b29423e990331ac5cd72e169de126d5511552331499c34d60d0e06c97f99769e4cee26c86b97ce7847768d796a07b9799e71a9642710d
+  metadata.gz: d3601c465aa36710d7c9b31f018bf314f18e87b2db73cf896ad8a19524f7123930fd79413dc66bc0316af35fe63902d3c08dcae30c868aae6bdde66dfbd7797a
+  data.tar.gz: 0c9ccaac1b56a1c344629993bbab0fa417e18c16178fb5c2c75bf7037c964138a6771c744b0a1b15f3c86e12d34a54e55fb351f66e7faa9f8ebf89c9bdb54e54

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_manager.rb

@@ -9,7 +9,7 @@ module CapistranoMulticonfigParallel
 
     cattr_accessor :debug_enabled
 
-    attr_accessor :jobs, :job_to_worker, :worker_to_job, :actor_system, :job_to_condition, :mutex, :registration_complete
+    attr_accessor :jobs, :job_to_worker, :worker_to_job, :actor_system, :job_to_condition, :mutex, :registration_complete, :workers_terminated
 
     attr_reader :worker_supervisor, :workers
     trap_exit :worker_died
@@ -34,7 +34,7 @@ module CapistranoMulticonfigParallel
       @worker_to_job = {}
       @job_to_condition = {}
 
-      @worker_supervisor.supervise_as(:terminal_server, CapistranoMulticonfigParallel::TerminalTable, Actor.current)
+      @worker_supervisor.supervise_as(:terminal_server, CapistranoMulticonfigParallel::TerminalTable, Actor.current, @job_manager)
       @worker_supervisor.supervise_as(:web_server, CelluloidPubsub::WebServer, self.class.websocket_config.merge(enable_debug: self.class.debug_websocket?))
     end
 
@@ -93,19 +93,24 @@ module CapistranoMulticonfigParallel
       @registration_complete = true if @job_manager.jobs.size == @job_to_worker.size
     end
 
+    def all_workers_finished?
+      @job_to_worker.all? { |job_id, worker| @jobs[job_id]['worker_action'] == 'finished' }
+    end
+    
     def process_jobs
+      @workers_terminated = Celluloid::Condition.new
       if syncronized_confirmation?
         @job_to_worker.pmap do |_job_id, worker|
           worker.async.start_task
         end
         wait_task_confirmations
       end
-      condition = @job_to_worker.all? { |_job_id, worker| worker.alive? && worker.worker_state == 'finished' }
-      until condition == true
+      condition = @workers_terminated.wait
+      until condition.present?
         sleep(0.1) # keep current thread alive
-      end
+    end
       debug("all jobs have completed #{condition}") if self.class.debug_enabled?
-      @job_manager.condition.signal('completed') if condition
+      Celluloid::Actor[:terminal_server].async.notify_time_change( CapistranoMulticonfigParallel::TerminalTable::TOPIC,  :type => "output") if Celluloid::Actor[:terminal_server].alive?
     end
 
     def apply_confirmations?
@@ -191,10 +196,10 @@ module CapistranoMulticonfigParallel
       @jobs.pmap do |job_id, job|
         worker = get_worker_for_job(job_id)
         worker.publish_rake_event('approved' => 'yes',
-                                  'action' => 'invoke',
-                                  'job_id' => job['id'],
-                                  'task' => task
-                                 )
+          'action' => 'invoke',
+          'job_id' => job['id'],
+          'task' => task
+        )
       end
     end
 
@@ -228,6 +233,9 @@ module CapistranoMulticonfigParallel
     end
 
     def process_job(job)
+      if job['processed']
+        @jobs[job['job_id']]
+      else
       env_options = {}
       job['env_options'].each do |key, value|
         env_options[key] = value if value.present? && !filtered_env_keys.include?(key)
@@ -238,8 +246,10 @@ module CapistranoMulticonfigParallel
         'env_name' => job['env'],
         'action_name' => job['action'],
         'env_options' => env_options,
-        'task_arguments' => job['task_arguments']
-      }
+        'task_arguments' => job['task_arguments'],
+        'processed' => true
+       }   
+      end
     end
 
     # lookup status of job by asking actor running it
@@ -265,6 +275,7 @@ module CapistranoMulticonfigParallel
     def worker_died(worker, reason)
       debug("worker with mailbox #{worker.mailbox.inspect} died  for reason:  #{reason}") if self.class.debug_enabled?
       job = @worker_to_job[worker.mailbox.address]
+      return if  @jobs[job['job_id']]['worker_action'] == "finished"
       @worker_to_job.delete(worker.mailbox.address)
       debug "restarting #{job} on new worker" if self.class.debug_enabled?
       return if job.blank? || job_failed?(job)

data/lib/capistrano_multiconfig_parallel/celluloid/celluloid_worker.rb

@@ -26,7 +26,7 @@ module CapistranoMulticonfigParallel
                   :rake_tasks, :current_task_number, # tracking tasks
                   :successfull_subscription, :subscription_channel, :publisher_channel, # for subscriptions and publishing events
                   :job_termination_condition, :worker_state
-
+    
     def work(job, manager)
       @job = job
       @worker_state = 'started'
@@ -217,10 +217,12 @@ module CapistranoMulticonfigParallel
 
     def finish_worker
       @manager.mark_completed_remaining_tasks(Actor.current)
-      @worker_state = 'finished'
-      @manager.job_to_worker.each do|_job_id, worker|
-        debug("worker #{worker.job_id}has state #{worker.worker_state}") if worker.alive? && debug_enabled?
-      end
+      @manager.jobs[@job_id]['worker_action'] = 'finished'
+      @manager.workers_terminated.signal('completed')  if @manager.all_workers_finished?
+    end
+    
+    def worker_finshed?
+       @manager.jobs[@job_id]['worker_action'] == 'finished'
     end
 
     def notify_finished(exit_status)

data/lib/capistrano_multiconfig_parallel/celluloid/child_process.rb

@@ -6,6 +6,8 @@ module CapistranoMulticonfigParallel
 
     attr_accessor :actor, :pid, :exit_status, :process, :filename, :worker_log
 
+    finalizer :process_finalizer
+      
     def work(cmd, options = {})
       @options = options
       @actor = @options.fetch(:actor, nil)
@@ -37,14 +39,17 @@ module CapistranoMulticonfigParallel
       end
     end
 
-    def check_exit_status
-      return unless @exit_status.present?
+    def process_finalizer
       @timer.cancel
       EM.stop
+    end
+    
+    def check_exit_status
+      return unless @exit_status.present?
       if @options[:dry_run]
         debug("worker #{@actor.job_id} starts execute deploy") if @actor.debug_enabled?
         @actor.async.execute_deploy
-      else
+      elsif !@actor.worker_finshed?
         debug("worker #{@actor.job_id} startsnotify finished") if @actor.debug_enabled?
         @actor.notify_finished(@exit_status)
       end

data/lib/capistrano_multiconfig_parallel/celluloid/rake_worker.rb

@@ -21,15 +21,15 @@ module CapistranoMulticonfigParallel
     end
 
     def wait_execution(name = task_name, time = 0.1)
-      info "Before waiting #{name}"
+  #    info "Before waiting #{name}"
       Actor.current.wait_for(name, time)
-      info "After waiting #{name}"
+    #  info "After waiting #{name}"
     end
 
     def wait_for(name, time)
-      info "waiting for #{time} seconds on #{name}"
+     # info "waiting for #{time} seconds on #{name}"
       sleep time
-      info "done waiting on #{name} "
+     # info "done waiting on #{name} "
     end
 
     def default_settings
@@ -95,7 +95,7 @@ module CapistranoMulticonfigParallel
       publish_to_worker(task_data)
       @successfull_subscription = true
     end
-
+    
     def stdin_approval(message)
       if @job_id.to_i == message['job_id'].to_i && message['approved'] == 'yes'
         @stdin_result = message

data/lib/capistrano_multiconfig_parallel/celluloid/terminal_table.rb

@@ -8,8 +8,9 @@ module CapistranoMulticonfigParallel
     include Celluloid::Logger
     TOPIC = 'sshkit_terminal'
 
-    def initialize(manager)
+    def initialize(manager, job_manager)
       @manager = manager
+      @job_manager = job_manager
       async.run
     end
 
@@ -49,6 +50,7 @@ module CapistranoMulticonfigParallel
       puts table
       puts "\n"
       sleep(1)
+      @job_manager.condition.signal('completed') if @manager.all_workers_finished? 
     end
 
     def worker_state(worker)
@@ -80,7 +82,7 @@ module CapistranoMulticonfigParallel
       job = @manager.jobs[job_id]
       processed_job = @manager.process_job(job)
       worker = @manager.get_worker_for_job(job_id)
-
+      
       {
         'job_id' => job_id,
         'app_name' => processed_job['app_name'],

data/lib/capistrano_multiconfig_parallel/helpers/base_manager.rb

@@ -174,7 +174,7 @@ module CapistranoMulticonfigParallel
     end
 
     def wait_jobs_termination
-      return if @jobs.blank? || CapistranoMulticonfigParallel.execute_in_sequence
+      return if CapistranoMulticonfigParallel.execute_in_sequence
       result = @condition.wait
       return unless result.present?
       @manager.terminate

data/lib/capistrano_multiconfig_parallel/version.rb

@@ -8,7 +8,7 @@ module CapistranoMulticonfigParallel
   module VERSION
     MAJOR = 0
     MINOR = 8
-    TINY = 0
+    TINY = 1
     PRE = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano_multiconfig_parallel
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - bogdanRada