X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/3acff4c57e3459dae420903c02c717cd5c07319f..d65964ad6063b6cd5420004a5cbdc58fe2d0b194:/services/api/app/models/job.rb

diff --git a/services/api/app/models/job.rb b/services/api/app/models/job.rb
index 17ca6cb9a6..1f0ef758d9 100644
--- a/services/api/app/models/job.rb
+++ b/services/api/app/models/job.rb
@@ -35,6 +35,7 @@ class Job < ArvadosModel
     t.add :tasks_summary
     t.add :dependencies
     t.add :log_stream_href
+    t.add :log_buffer
   end
 
   def assert_finished
@@ -50,13 +51,17 @@ class Job < ArvadosModel
   end
 
   def self.queue
-    self.where('started_at is ? and is_locked_by_uuid is ? and cancelled_at is ?',
-               nil, nil, nil).
+    self.where('started_at is ? and is_locked_by_uuid is ? and cancelled_at is ? and success is ?',
+               nil, nil, nil, nil).
       order('priority desc, created_at')
   end
 
   protected
 
+  def foreign_key_attributes
+    super + %w(output log)
+  end
+
   def ensure_script_version_is_commit
     if self.is_locked_by_uuid and self.started_at
       # Apparently client has already decided to go for it. This is
@@ -103,7 +108,8 @@ class Job < ArvadosModel
 
   def permission_to_update
     if is_locked_by_uuid_was and !(current_user and
-                                   current_user.uuid == is_locked_by_uuid_was)
+                                   (current_user.uuid == is_locked_by_uuid_was or
+                                    current_user.uuid == system_user.uuid))
       if script_changed? or
           script_parameters_changed? or
           script_version_changed? or
@@ -166,4 +172,14 @@ class Job < ArvadosModel
     end
   end
 
+  def log_buffer
+    begin
+      @@redis ||= Redis.new(:timeout => 0)
+      if @@redis.exists uuid
+        @@redis.getrange(uuid, 0 - 2**10, -1)
+      end
+    rescue Redis::CannotConnectError
+      return '(not available)'
+    end
+  end
 end