right_chimp 1.1.2 → 1.1.3

data/CHANGES

@@ -130,3 +130,7 @@ Version 1.1.2
 -------------
 * Bugfix: Fix queueing of 'held' jobs to pull no more than one job from the queue
 * Bugfix: Fix issue where ssh commands were non-functional
+
+Version 1.1.3
+-------------
+* Bugfix: Fix issue where queued/held jobs move into a waiting state and do nothing

data/lib/right_chimp/Chimp.rb

@@ -342,6 +342,11 @@ module Chimp
     # Check for any invalid combinations of command line options
     #
     def check_option_validity
+      if @hold && !@array_names.empty?
+        puts "ERROR: Holding of array objects is not yet supported"
+        exit 1
+      end
+
       if @tags.empty? and @array_names.empty? and @deployment_names.empty? and not @chimpd_wait_until_done
         puts "ERROR: Please select the objects to operate upon."
         help

data/lib/right_chimp/queue/ChimpQueue.rb

@@ -50,7 +50,7 @@ module Chimp
     def push(g, w)
       raise "no group specified" unless g
       create_group(g) if not ChimpQueue[g]
-      ChimpQueue[g].push(w)
+      ChimpQueue[g].push(w) unless ChimpQueue[g].get_job(w.job_id)
     end
     
     def create_group(name, type = :parallel, concurrency = 1)

data/lib/right_chimp/queue/ExecutionGroup.rb

@@ -55,7 +55,7 @@ module Chimp
       @queue.each do |job|
         if found_job || job.status == Executor::STATUS_HOLDING
           updated_queue.push(job)
-        else
+        elsif job.status == Executor::STATUS_NONE
           found_job = job
         end
       end
@@ -200,12 +200,13 @@ module Chimp
     # Queue a held job by id
     #
     def queue(id)
-      Log.debug "Requeuing job id #{id}"
+      Log.debug "Queuing held job id #{id}"
       job = @jobs_by_id[id]
       job.owner = nil
       job.time_start = Time.now
       job.time_end = nil
       job.status = Executor::STATUS_NONE
+      self.push(job)
     end
 
     #

data/lib/right_chimp/templates/all_jobs.erb

@@ -67,8 +67,8 @@ SINCE 2012</p>
 
 <p>[
 <% if job_filter == 'running' or job_filter == nil %>running<% else %><a href="/display/running">running</a><% end %> |
-<% if job_filter == 'none' %>waiting<% else %><a href="/display/none">waiting</a> <% end %> |
 <% if job_filter == 'holding' %>holding<% else %><a href="/display/holding">holding</a> <% end %> |
+<% if job_filter == 'none' %>waiting<% else %><a href="/display/none">waiting</a> <% end %> |
 <% if job_filter == 'done' %>completed<% else %><a href="/display/done">completed</a><% end %> |
 <% if job_filter == 'error' %>failed<% else %><a href="/display/error">failed</a><% end %>
  |

data/lib/right_chimp/version.rb

@@ -1,3 +1,3 @@
 module Chimp
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: right_chimp
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-06 00:00:00.000000000 Z
+date: 2014-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest_connection