X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/d6cc9d6e055974384be446f6da8218ff7da048ae..74c3346a12b71f8c85e4fae6c390a9e374bc39a8:/services/api/app/models/job.rb

diff --git a/services/api/app/models/job.rb b/services/api/app/models/job.rb
index d34d6df6b6..9c8f724120 100644
--- a/services/api/app/models/job.rb
+++ b/services/api/app/models/job.rb
@@ -8,6 +8,7 @@ class Job < ArvadosModel
   before_create :ensure_unique_submit_id
   before_create :ensure_script_version_is_commit
   before_update :ensure_script_version_is_commit
+  after_commit :trigger_crunch_dispatch_if_cancelled, :on => :update
 
   has_many :commit_ancestors, :foreign_key => :descendant, :primary_key => :script_version
 
@@ -33,6 +34,8 @@ class Job < ArvadosModel
     t.add :runtime_constraints
     t.add :tasks_summary
     t.add :dependencies
+    t.add :log_stream_href
+    t.add :log_buffer
   end
 
   def assert_finished
@@ -41,6 +44,12 @@ class Job < ArvadosModel
                       running: false)
   end
 
+  def log_stream_href
+    unless self.finished_at
+      "#{current_api_base}/#{self.class.to_s.pluralize.underscore}/#{self.uuid}/log_tail_follow"
+    end
+  end
+
   def self.queue
     self.where('started_at is ? and is_locked_by_uuid is ? and cancelled_at is ?',
                nil, nil, nil).
@@ -49,6 +58,10 @@ class Job < ArvadosModel
 
   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
@@ -56,11 +69,13 @@ class Job < ArvadosModel
       # instead of a commit-ish.
       return true
     end
-    sha1 = Commit.find_by_commit_ish(self.script_version) rescue nil
-    if sha1
-      self.script_version = sha1
-    else
-      raise ArgumentError.new("Specified script_version does not resolve to a commit")
+    if new_record? or script_version_changed?
+      sha1 = Commit.find_by_commit_ish(self.script_version) rescue nil
+      if sha1
+        self.script_version = sha1
+      else
+        raise ArgumentError.new("Specified script_version does not resolve to a commit")
+      end
     end
   end
 
@@ -97,9 +112,10 @@ class Job < ArvadosModel
       if script_changed? or
           script_parameters_changed? or
           script_version_changed? or
-          cancelled_by_client_changed? or
-          cancelled_by_user_changed? or
-          cancelled_at_changed? or
+          (!cancelled_at_was.nil? and
+           (cancelled_by_client_uuid_changed? or
+            cancelled_by_user_uuid_changed? or
+            cancelled_at_changed?)) or
           started_at_changed? or
           finished_at_changed? or
           running_changed? or
@@ -128,4 +144,41 @@ class Job < ArvadosModel
       end
     end
   end
+
+  def update_modified_by_fields
+    if self.cancelled_at_changed?
+      # Ensure cancelled_at cannot be set to arbitrary non-now times,
+      # or changed once it is set.
+      if self.cancelled_at and not self.cancelled_at_was
+        self.cancelled_at = Time.now
+        self.cancelled_by_user_uuid = current_user.uuid
+        self.cancelled_by_client_uuid = current_api_client.uuid
+        @need_crunch_dispatch_trigger = true
+      else
+        self.cancelled_at = self.cancelled_at_was
+        self.cancelled_by_user_uuid = self.cancelled_by_user_uuid_was
+        self.cancelled_by_client_uuid = self.cancelled_by_client_uuid_was
+      end
+    end
+    super
+  end
+
+  def trigger_crunch_dispatch_if_cancelled
+    if @need_crunch_dispatch_trigger
+      File.open(Rails.configuration.crunch_refresh_trigger, 'wb') do
+        # That's all, just create/touch a file for crunch-job to see.
+      end
+    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