naf 2.1.5 → 2.1.6

data/RELEASE_NOTES.rdoc

@@ -1,5 +1,34 @@
 = Release Notes
 
+=== Version 2.1.6
+Bug fixes:
+* Historical jobs application_schedule_id was not getting set, causing the runner to constantly queue applications.
+* Pagination of application schedules on the index page was not properly working.
+* When mouse hovered over the application schedule on the applicaiton show page, it did not show a detailed information about the schedule.
+
+Changes:
+* Included application name when editing an application schedule
+
+=== Version 2.1.5
+Bug fix:
+* The code to manually add jobs/applications/schedules to the queue (::Logical::Naf::ConstructionZone::Boss) had an unecessary parameter that got passed into a call to create a job, thus raising an exception.
+
+=== Version 2.1.4
+Bug fix:
+* The Runner was using ruby Threads to write the logs of each running script. There was a specific script that caused write blocks and raised an EPIPE exception. The code is no longer using ruby Threads.
+
+=== Version 2.1.3
+Bug fix:
+* Migrations would fail if run all at once, because it did not consider the existence of the Janitor's Application Schedule. It would then fail, because run_interval is null, run_start_minute is dropped, and a not null constraint is set on run_interval.
+
+=== Version 2.1.2
+Bug fix:
+* Rescue EAGAIN and EWOULDBLOCK exceptions and log them.
+
+=== Version 2.1.1
+Bug fix:
+* When marking a machine down, it logs the id of the machine doing the action. But if this machine does not have an associated row in naf.machines, it raises an exception.
+
 === Version 2.1.0
 
 Featurs/Changes:
@@ -11,7 +40,7 @@ Featurs/Changes:
 
 === Version 2.0.0
 
-Featurs/Changes:
+Features/Changes:
 * New logging system
 * Removed compatibility with Papertrail
 * UI changes

data/app/controllers/naf/application_schedules_controller.rb

@@ -1,10 +1,14 @@
 module Naf
   class ApplicationSchedulesController < Naf::ApplicationController
 
+    before_filter :set_rows_per_page
+
     def index
       respond_to do |format|
         format.html
         format.json do
+          set_page
+
           application_schedules = []
           application_schedule = []
           @total_records = Naf::ApplicationSchedule.count(:all)

data/app/models/logical/naf/application_schedule.rb

@@ -130,7 +130,7 @@ module Logical
         if schedule.run_interval_style.name == 'at beginning of day'
           output = exact_time_of_day(time)
         else
-          output = interval_time2(time)
+          output = interval_time(time)
         end
 
         output
@@ -147,7 +147,7 @@ module Logical
         return output
       end
 
-      def interval_time2(time)
+      def interval_time(time)
         if time < 9
           ":0#{time}"
         else
@@ -155,16 +155,6 @@ module Logical
         end
       end
 
-      def interval_time(time)
-        if time < 60
-          pluralize(time, 'minute')
-        elsif time % 60 == 0
-          pluralize(time / 60, 'hour')
-        else
-          pluralize(time / 60, 'hour') + ', ' + pluralize(time % 60, 'minute')
-        end
-      end
-
       def application_run_group_name
         if schedule.application_run_group_name.present?
           schedule.application_run_group_name

data/app/models/logical/naf/construction_zone/proletariat.rb

@@ -27,6 +27,7 @@ module Logical::Naf::ConstructionZone
 
     def create_queued_job(historical_job)
       queued_job = ::Naf::QueuedJob.new(application_id: historical_job.application_id,
+                                        application_schedule_id: historical_job.application_schedule_id,
                                         application_type_id: historical_job.application_type_id,
                                         command: historical_job.command,
                                         application_run_group_restriction_id: historical_job.application_run_group_restriction_id,

data/app/models/logical/naf/construction_zone/work_order.rb

@@ -49,6 +49,7 @@ module Logical::Naf::ConstructionZone
         application_run_group_limit: application_run_group_limit,
         priority: priority,
         application_id: application.try(:id),
+        application_schedule_id: application_schedule.try(:id)
       }
     end
 
@@ -57,26 +58,25 @@ module Logical::Naf::ConstructionZone
         if affinity.is_a? Symbol
           # short_name of affinity
           affinity_object = {
-            :affinity_id => ::Naf::Affinity.find_by_affinity_short_name(affinity).try(:id)
+            affinity_id: ::Naf::Affinity.find_by_affinity_short_name(affinity).try(:id)
           }
           raise "no affinity provided" if affinity_object[:affinity_id].nil?
           affinity_object
         elsif affinity.is_a? ::Naf::Affinity
           {
-            :affinity_id => affinity.id
+            affinity_id: affinity.id
           }
         elsif affinity.is_a? ::Naf::Machine
           # affinity_for machine
           {
-            :affinity_id => affinity.affinity.id
+            affinity_id: affinity.affinity.id
           }
         elsif affinity.is_a? ::Naf::ApplicationScheduleAffinityTab
           # affinity_for application_schedule_affinity_tab
         elsif affinity.is_a? Hash
           # should have key: :affinity_id or :affinity_short_name or :affinity_name
           # may have key: :affinity_parameter
-          affinity_object = {
-          }
+          affinity_object = {}
           if affinity.has_key?(:affinity_id)
             affinity_object[:affinity_id] = affinity[:affinity_id]
           elsif affinity.has_key?(:affinity_name)

data/app/views/naf/application_schedules/_form.html.erb

@@ -7,6 +7,11 @@
 
   <%= f.hidden_field :application_id, value: @application_schedule.application_id %>
 
+  <div class="field">
+    <%= f.label "Application" %>
+    <p><%= @application_schedule.application.title %></p>
+  </div>
+
   <div class="field">
     <%= f.label :application_run_group_restriction_id, "Application run group restriction*" %>
     <%= f.select(:application_run_group_restriction_id,

data/app/views/naf/application_schedules/show.html.erb

@@ -10,7 +10,7 @@
   </div>
 
   <div id="record">
-    <h2>Application</h2>
+    <h2>Application Schedule</h2>
     <%= link_to 'Back to Application Schedules', application_schedules_path %>
     &nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;
     <%= link_to 'Edit', controller: 'application_schedules',

data/app/views/naf/applications/show.html.erb

@@ -102,7 +102,9 @@
             <% output = '' %>
             <% @logical_application.application_schedules.each do |schedule|
                   logical_schedule = ::Logical::Naf::ApplicationSchedule.new(schedule)
-                  output << (link_to logical_schedule.display, naf.application_schedule_path(schedule.id))
+                  output << (link_to logical_schedule.display,
+                                     naf.application_schedule_path(schedule.id),
+                                     title: logical_schedule.help_title)
                   output << ', '
                 end
                 output = output[0..-3] %>

data/lib/naf/version.rb

@@ -1,3 +1,3 @@
 module Naf
-  VERSION = "2.1.5"
+  VERSION = '2.1.6'
 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-02-26'
+  s.date        = '2014-03-05'
   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"

data/spec/dummy/config/environments/test.rb

@@ -34,4 +34,8 @@ Dummy::Application.configure do
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
+
+  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
+  # the I18n.default_locale when a translation can not be found)
+  config.i18n.enforce_available_locales = false
 end

data/spec/models/logical/naf/construction_zone/work_order_spec.rb

@@ -0,0 +1,105 @@
+require 'spec_helper'
+
+module Logical::Naf::ConstructionZone
+
+  describe WorkOrder do
+    let(:command) { '::Process::Naf::Janitor.run' }
+    let!(:work_order) {
+      ::Logical::Naf::ConstructionZone::WorkOrder.new(command)
+    }
+
+    describe '#historical_job_parameters' do
+      let(:params) {
+        {
+          command: command,
+          application_type_id: ::Naf::ApplicationType.rails.id,
+          application_run_group_restriction_id: ::Naf::ApplicationRunGroupRestriction.limited_per_all_machines.id,
+          application_run_group_name: command,
+          application_run_group_limit: 1,
+          priority: 0,
+          application_id: nil,
+          application_schedule_id: nil
+        }
+      }
+      it 'return correct values' do
+        work_order.historical_job_parameters.should == params
+      end
+    end
+
+    describe '#historical_job_affinity_tab_parameters' do
+      it 'return hash with the affinity_id when a symbol is provided' do
+        affinity = FactoryGirl.create(:affinity, id: 4, affinity_short_name: :small)
+        work_order.instance_variable_set(:@affinities, [:small])
+        work_order.historical_job_affinity_tab_parameters.
+          should == [{ affinity_id: affinity.id }]
+      end
+
+      it 'raise an exception when there is not an object associated with the symbol' do
+        work_order.instance_variable_set(:@affinities, [:small])
+        expect { work_order.historical_job_affinity_tab_parameters }.
+          to raise_error 'no affinity provided'
+      end
+
+      it 'return hash with the affinity_id when an Affinity object is provided' do
+        affinity = ::Naf::Affinity.first
+        work_order.instance_variable_set(:@affinities, [affinity])
+        work_order.historical_job_affinity_tab_parameters.
+          should == [{ affinity_id: affinity.id }]
+      end
+
+      it 'return hash with the affinity_id when a Machine object is provided' do
+        machine = FactoryGirl.create(:machine)
+        classification = FactoryGirl.create(:location_affinity_classification)
+        affinity = FactoryGirl.create(:affinity, id: 4,
+                                                 affinity_name: machine.id.to_s,
+                                                 affinity_classification: classification)
+        work_order.instance_variable_set(:@affinities, [machine])
+        work_order.historical_job_affinity_tab_parameters.
+          should == [{ affinity_id: affinity.id }]
+      end
+
+      it 'return nil when an ApplicationScheduleAffintyTab object is provided' do
+        tab = FactoryGirl.build(:app_schedule_affinity_tab_base)
+        work_order.instance_variable_set(:@affinities, [tab])
+        work_order.historical_job_affinity_tab_parameters.should == [nil]
+      end
+
+      it 'return hash with the affinity_id when a Hash object is provided' do
+        affinity = { affinity_id: 1 }
+        work_order.instance_variable_set(:@affinities, [affinity])
+        work_order.historical_job_affinity_tab_parameters.should == [affinity]
+      end
+
+      it 'raise an exception when a empty Hash object is provided' do
+        work_order.instance_variable_set(:@affinities, [{}])
+        expect { work_order.historical_job_affinity_tab_parameters }.
+          to raise_error 'no affinity provided'
+      end
+
+      it 'raise an exception when a unknown object is provided' do
+        work_order.instance_variable_set(:@affinities, [[]])
+        expect { work_order.historical_job_affinity_tab_parameters }.
+          to raise_error 'unknown affinity kind: []'
+      end
+    end
+
+    describe '#historical_job_parameters' do
+      it 'raise an exception when a non historical job is in prerequisites' do
+        work_order.instance_variable_set(:@prerequisites, [1])
+        expect { work_order.historical_job_prerequisite_historical_jobs }.
+          to raise_error "found a non Naf::HistoricalJob in prerequisites: 1"
+      end
+
+      it 'not raise an exception when a historical job is in prerequisites' do
+        historical_job = FactoryGirl.build(:job_base)
+        work_order.instance_variable_set(:@prerequisites, [historical_job])
+        work_order.historical_job_prerequisite_historical_jobs.should == [historical_job]
+      end
+
+      it 'not raise an exception when prerequisites is empty' do
+        work_order.historical_job_prerequisite_historical_jobs.should == []
+      end
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: naf
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-26 00:00:00.000000000 Z
+date: 2014-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -485,6 +485,7 @@ files:
 - spec/factories/naf.rb
 - spec/helpers/naf/application_helper_spec.rb
 - spec/models/logical/naf/application_spec.rb
+- spec/models/logical/naf/construction_zone/work_order_spec.rb
 - spec/models/logical/naf/job_fetcher_spec.rb
 - spec/models/logical/naf/job_spec.rb
 - spec/models/logical/naf/log_file_spec.rb
@@ -599,6 +600,7 @@ test_files:
 - spec/factories/naf.rb
 - spec/helpers/naf/application_helper_spec.rb
 - spec/models/logical/naf/application_spec.rb
+- spec/models/logical/naf/construction_zone/work_order_spec.rb
 - spec/models/logical/naf/job_fetcher_spec.rb
 - spec/models/logical/naf/job_spec.rb
 - spec/models/logical/naf/log_file_spec.rb