naf 2.0.2 → 2.0.3

data/app/controllers/naf/historical_jobs_controller.rb

@@ -107,26 +107,29 @@ module Naf
       respond_to do |format|
         @historical_job = Naf::HistoricalJob.find(params[:id])
         if @historical_job.update_attributes(params[:historical_job])
-          if params[:historical_job][:request_to_terminate].present?
-            if queued_job = ::Naf::QueuedJob.find_by_id(params[:id])
-              @historical_job.finished_at = Time.zone.now
-              @historical_job.save!
-              queued_job.delete
-            end
 
-            if running_job = ::Naf::RunningJob.find_by_id(params[:id])
-              running_job.update_attributes(request_to_terminate: true)
-              @historical_job.update_attributes(request_to_terminate: true)
+          ::Naf::HistoricalJob.lock_for_job_queue do
+            if params[:historical_job][:request_to_terminate].present?
+              if queued_job = ::Naf::QueuedJob.find_by_id(params[:id])
+                @historical_job.finished_at = Time.zone.now
+                @historical_job.save!
+                queued_job.delete
+              end
+
+              if running_job = ::Naf::RunningJob.find_by_id(params[:id])
+                running_job.update_attributes(request_to_terminate: true)
+                @historical_job.update_attributes(request_to_terminate: true)
+              end
             end
-          end
 
-          format.html do
-            redirect_to(@historical_job, notice: "Job '#{@historical_job.command}' was successfully updated.")
-          end
-          format.json do
-            render json: { success: true,
-                           title: @historical_job.title,
-                           command: @historical_job.command }.to_json
+            format.html do
+              redirect_to(@historical_job, notice: "Job '#{@historical_job.command}' was successfully updated.")
+            end
+            format.json do
+              render json: { success: true,
+                             title: @historical_job.title,
+                             command: @historical_job.command }.to_json
+            end
           end
         else
           format.html do

data/app/models/process/naf/runner.rb

@@ -76,6 +76,7 @@ module Process::Naf
       machine.lock_for_runner_use
       begin
         cleanup_old_processes
+        remove_invalid_running_jobs
         wind_down_runners
 
         # Create a machine runner, if it doesn't exist
@@ -100,6 +101,14 @@ module Process::Naf
       end
     end
 
+    def remove_invalid_running_jobs
+      ::Naf::RunningJob.
+        joins("INNER JOIN #{Naf.schema_name}.historical_jobs AS hj ON hj.id = #{Naf.schema_name}.running_jobs.id").
+        where('finished_at IS NOT NULL AND hj.started_on_machine_id = ?', @machine.id).readonly(false).each do |job|
+          job.delete
+      end
+    end
+
     def check_gc_configurations
       unless @disable_gc_modifications
         # These configuration changes will help forked processes, not the runner
@@ -589,7 +598,7 @@ module Process::Naf
 
     def assigned_jobs(record)
       if record.kind_of? ::Naf::MachineRunnerInvocation
-        return ::Naf::RunningJob.started_on_invocation(record.id).select do |job|
+        return ::Naf::RunningJob.started_on_invocation(record.id).readonly(false).select do |job|
           is_job_process_alive?(job)
         end
       else

data/lib/naf/version.rb

@@ -1,3 +1,3 @@
 module Naf
-  VERSION = "2.0.2"
+  VERSION = "2.0.3"
 end

data/naf.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.name        = "naf"
   s.version     = Naf::VERSION
   s.license     = 'New BSD License'
-  s.date        = '2014-01-06'
+  s.date        = '2014-01-07'
   s.summary     = "Creates infrastructure for a customizable and robust Postgres-backed script scheduling/running"
   s.description = "A cloud based distributed cron, application framework and operations console. Naf works as a distributed script running " +
                   "system that provides scheduling, logging, alarming, machine redundancy, and the ability to set constraint during script execution"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: naf
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-06 00:00:00.000000000 Z
+date: 2014-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails