Merge branch '15522-arvmount-ops-encoding'

[arvados.git] / services / api / db / migrate / 20140918153705_add_state_to_job.rb

diff --git a/services/api/db/migrate/20140918153705_add_state_to_job.rb b/services/api/db/migrate/20140918153705_add_state_to_job.rb
index 176b0e4df2431b469161b928609197dddafe6772..46a5e84362402d0f4e16086e33a7ffbb7fee7b9c 100644 (file)
--- a/services/api/db/migrate/20140918153705_add_state_to_job.rb
+++ b/services/api/db/migrate/20140918153705_add_state_to_job.rb
@@ -1,4 +1,8 @@
-class AddStateToJob < ActiveRecord::Migration
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
+class AddStateToJob < ActiveRecord::Migration[4.2]
   include CurrentApiClient
 
   def up
@@ -9,8 +13,8 @@ class AddStateToJob < ActiveRecord::Migration
       Job.update_all({state: 'Failed'}, ['state is null and success = ?', false])
       Job.update_all({state: 'Complete'}, ['state is null and success = ?', true])
       Job.update_all({state: 'Running'}, ['state is null and running = ?', true])
-      # Locked, but not Running/Failed/Complete? Let's assume it failed.
-      Job.update_all({state: 'Failed'}, ['state is null and is_locked_by_uuid is not null', true])
+      # Locked/started, but not Running/Failed/Complete? Let's assume it failed.
+      Job.update_all({state: 'Failed'}, ['state is null and (is_locked_by_uuid is not null or started_at is not null)'])
       Job.update_all({state: 'Queued'}, ['state is null'])
     end
   end