X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/eff3277fa6800bbc4ac81654f8883bbfd3a85d30..3cb494b4438c9b59d2ac6b233dccb0d92c4982e8:/services/api/app/models/pipeline_instance.rb

diff --git a/services/api/app/models/pipeline_instance.rb b/services/api/app/models/pipeline_instance.rb
index 32c284bb6d..354c8924e7 100644
--- a/services/api/app/models/pipeline_instance.rb
+++ b/services/api/app/models/pipeline_instance.rb
@@ -1,5 +1,5 @@
 class PipelineInstance < ArvadosModel
-  include AssignUuid
+  include HasUuid
   include KindAndEtag
   include CommonApiTemplate
   serialize :components, Hash
@@ -8,7 +8,7 @@ class PipelineInstance < ArvadosModel
   belongs_to :pipeline_template, :foreign_key => :pipeline_template_uuid, :primary_key => :uuid
 
   before_validation :bootstrap_components
-  before_validation :update_success
+  before_validation :update_state
   before_validation :verify_status
   before_create :set_state_before_save
   before_save :set_state_before_save
@@ -18,8 +18,6 @@ class PipelineInstance < ArvadosModel
     t.add :pipeline_template, :if => :pipeline_template
     t.add :name
     t.add :components
-    t.add :success
-    t.add :active
     t.add :dependencies
     t.add :properties
     t.add :state
@@ -27,13 +25,16 @@ class PipelineInstance < ArvadosModel
   end
 
   # Supported states for a pipeline instance
-  New = 'New'
-  Ready = 'Ready'
-  RunningOnServer = 'RunningOnServer'
-  RunningOnClient = 'RunningOnClient'
-  Paused = 'Paused'
-  Failed = 'Failed'
-  Complete = 'Complete'
+  States =
+    [
+     (New = 'New'),
+     (Ready = 'Ready'),
+     (RunningOnServer = 'RunningOnServer'),
+     (RunningOnClient = 'RunningOnClient'),
+     (Paused = 'Paused'),
+     (Failed = 'Failed'),
+     (Complete = 'Complete'),
+    ]
 
   def dependencies
     dependency_search(self.components).keys
@@ -77,7 +78,7 @@ class PipelineInstance < ArvadosModel
         else
           row << 0.0
           if step['failed']
-            self.success = false
+            self.state = Failed
           end
         end
         row << (step['warehousejob']['id'] rescue nil)
@@ -98,7 +99,7 @@ class PipelineInstance < ArvadosModel
   end
 
   def self.queue
-    self.where("active = true or state = 'RunningOnClient'")
+    self.where("state = 'RunningOnServer'")
   end
 
   protected
@@ -108,9 +109,9 @@ class PipelineInstance < ArvadosModel
     end
   end
 
-  def update_success
+  def update_state
     if components and progress_ratio == 1.0
-      self.success = true
+      self.state = Complete
     end
   end
 
@@ -141,68 +142,25 @@ class PipelineInstance < ArvadosModel
   def verify_status
     changed_attributes = self.changed
 
-    if 'state'.in? changed_attributes
-      case self.state
-      when New, Ready, Paused
-        self.active = nil
-        self.success = nil
-      when RunningOnServer
-        self.active = true
-        self.success = nil
-      when RunningOnClient
-        self.active = false
-        self.success = nil
-      when Failed
-        self.active = false
-        self.success = false
-        self.state = Failed   # before_validation will fail if false is returned in the previous line
-      when Complete
-        self.active = false
-        self.success = true
-      else
-        return false
-      end
-    elsif 'success'.in? changed_attributes
-      if self.success
-        self.active = false
-        self.state = Complete
-      else
-        self.active = false
-        self.state = Failed
-      end
-    elsif 'active'.in? changed_attributes
-      if self.active
-        if self.state == New || self.state == Ready || self.state == Paused
-          self.state = RunningOnServer
-        end
-      else
-        if self.components_look_ready?
-          self.state = Ready
-        else
-          self.state = New
-        end
+    if new_record? or 'components'.in? changed_attributes
+      self.state ||= New
+      if (self.state == New) and self.components_look_ready?
+        self.state = Ready
       end
     end
 
-    if 'components'.in? changed_attributes
-      if self.components_look_ready? && (!self.state || self.state == New)
-        self.state = Ready
-      end
+    if self.state.in?(States)
+      true
+    else
+      errors.add :state, "'#{state.inspect} must be one of: [#{States.join ', '}]"
+      false
     end
   end
 
   def set_state_before_save
-    if !self.state || self.state == New || self.state == Ready || self.state == Paused
-      if self.active
-        self.state = RunningOnServer
-      elsif self.components_look_ready? && (!self.state || self.state == New)
-        self.state = Ready
-      end
+    if self.components_look_ready? && (!self.state || self.state == New)
+      self.state = Ready
     end
-
-    if self.state == Ready || self.state == New
-      self.active = nil
-    end 
   end
 
 end