right_chimp 1.1.1 → 1.1.2

data/CHANGES

@@ -125,3 +125,8 @@ Version 1.1.0
 Version 1.1.1
 -------------
 * Bugfix: Enable timeouts on server arrays
+
+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

data/lib/right_chimp/daemon/ChimpDaemon.rb

@@ -368,6 +368,7 @@ module Chimp
 
         jobs = queue.get_jobs_by_status(:running) if id == 'running'
         jobs = queue.get_jobs_by_status(:error)   if id == 'error'
+        jobs = queue.get_jobs_by_status(:holding) if id == 'holding'
         jobs = queue.get_jobs                     if id == 'all'
 
         raise WEBrick::HTTPStatus::PreconditionFailed.new('invalid or missing job_id #{id}') unless jobs.size > 0
@@ -382,6 +383,16 @@ module Chimp
 
           resp.set_redirect( WEBrick::HTTPStatus::TemporaryRedirect, req.header['referer'])
 
+        #
+        # queue a job
+        #
+        elsif req.request_uri.path =~ /queue$/
+          jobs.each do |j|
+            j.queue
+          end
+
+          resp.set_redirect( WEBrick::HTTPStatus::TemporaryRedirect, req.header['referer'])
+
         #
         # retry a job
         #

data/lib/right_chimp/exec/Executor.rb

@@ -57,6 +57,13 @@ module Chimp
       end
     end
     
+    #
+    # Convenience method to queue a held job
+    #
+    def queue
+      @group.queue(self.job_id)
+    end
+    
     #
     # Convenience method to requeue
     #

data/lib/right_chimp/queue/ChimpQueue.rb

@@ -48,13 +48,6 @@ module Chimp
     # Push a task into the queue
     #
     def push(g, w)
-      if w.exec.right_script && w.exec.right_script.kind_of?(Hash)
-        Log.debug "Pushing job '#{w.exec.right_script['name']}' into group '#{g}'"
-        if w.status == Executor::STATUS_HOLDING
-          Log.info "Holding job '#{w.exec.right_script['name']}'"
-        end
-      end
-
       raise "no group specified" unless g
       create_group(g) if not ChimpQueue[g]
       ChimpQueue[g].push(w)

data/lib/right_chimp/queue/ExecutionGroup.rb

@@ -196,6 +196,18 @@ module Chimp
       end
     end
 
+    #
+    # Queue a held job by id
+    #
+    def queue(id)
+      Log.debug "Requeuing 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
+    end
+
     #
     # Requeue a job by id
     #

data/lib/right_chimp/templates/all_jobs.erb

@@ -159,7 +159,7 @@ jobs.each do |j|
     <%  when Executor::STATUS_RUNNING, Executor::STATUS_RETRYING, Executor::STATUS_NONE  %>
       <a href="#" onclick="chimpd_job_control(this, '/job/<%=id%>/cancel')">cancel</a>
     <%  when Executor::STATUS_HOLDING %>
-      <a href="#" onclick="chimpd_job_control(this, '/job/<%=id%>/retry')">queue</a>
+      <a href="#" onclick="chimpd_job_control(this, '/job/<%=id%>/queue')">queue</a>
       <a href="#" onclick="chimpd_job_control(this, '/job/<%=id%>/cancel')">cancel</a>
     <%  when Executor::STATUS_DONE %>
       <a href="#" onclick="chimpd_job_control(this, '/job/<%=id%>/retry')">requeue</a>

data/lib/right_chimp/version.rb

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

metadata

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