projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '2488-jobs-pipeline-doc'
[arvados.git]
/
services
/
api
/
app
/
models
/
job.rb
diff --git
a/services/api/app/models/job.rb
b/services/api/app/models/job.rb
index 9c8f724120ba8049b4a498141e669c5708ca0317..0b2247bc21d99196b839f58a0dca37a2d10c284f 100644
(file)
--- a/
services/api/app/models/job.rb
+++ b/
services/api/app/models/job.rb
@@
-27,6
+27,7
@@
class Job < ArvadosModel
t.add :started_at
t.add :finished_at
t.add :output
t.add :started_at
t.add :finished_at
t.add :output
+ t.add :output_is_persistent
t.add :success
t.add :running
t.add :is_locked_by_uuid
t.add :success
t.add :running
t.add :is_locked_by_uuid
@@
-36,6
+37,8
@@
class Job < ArvadosModel
t.add :dependencies
t.add :log_stream_href
t.add :log_buffer
t.add :dependencies
t.add :log_stream_href
t.add :log_buffer
+ t.add :nondeterministic
+ t.add :repository
end
def assert_finished
end
def assert_finished
@@
-51,8
+54,13
@@
class Job < ArvadosModel
end
def self.queue
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
+
+ def self.running
+ self.where('running = ?', true).
order('priority desc, created_at')
end
order('priority desc, created_at')
end
@@
-62,6
+70,10
@@
class Job < ArvadosModel
super + %w(output log)
end
super + %w(output log)
end
+ def skip_uuid_read_permission_check
+ super + %w(cancelled_by_client_uuid)
+ 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
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
@@
-70,7
+82,7
@@
class Job < ArvadosModel
return true
end
if new_record? or script_version_changed?
return true
end
if new_record? or script_version_changed?
- sha1 = Commit.find_
by_commit_ish(self.script_version)
rescue nil
+ sha1 = Commit.find_
commit_range(current_user, nil, nil, self.script_version, nil)[0]
rescue nil
if sha1
self.script_version = sha1
else
if sha1
self.script_version = sha1
else
@@
-108,7
+120,8
@@
class Job < ArvadosModel
def permission_to_update
if is_locked_by_uuid_was and !(current_user and
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
if script_changed? or
script_parameters_changed? or
script_version_changed? or