projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '2751-python-sdk-keep-proxy-support' closes #2751
[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 17ca6cb9a60e7325aafea48a7bae6d6f6ed6783a..fbc5640b3762fef94934ed271d8501b78c31ac14 100644
(file)
--- a/
services/api/app/models/job.rb
+++ b/
services/api/app/models/job.rb
@@
-1,5
+1,5
@@
class Job < ArvadosModel
class Job < ArvadosModel
- include
Assign
Uuid
+ include
Has
Uuid
include KindAndEtag
include CommonApiTemplate
serialize :script_parameters, Hash
include KindAndEtag
include CommonApiTemplate
serialize :script_parameters, Hash
@@
-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
@@
-35,6
+36,9
@@
class Job < ArvadosModel
t.add :tasks_summary
t.add :dependencies
t.add :log_stream_href
t.add :tasks_summary
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
@@
-50,13
+54,30
@@
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
protected
order('priority desc, created_at')
end
protected
+ def foreign_key_attributes
+ super + %w(output log)
+ end
+
+ def skip_uuid_read_permission_check
+ super + %w(cancelled_by_client_uuid)
+ end
+
+ def skip_uuid_existence_check
+ 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
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
@@
-65,7
+86,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, self.repository, nil, self.script_version, nil)[0]
rescue nil
if sha1
self.script_version = sha1
else
if sha1
self.script_version = sha1
else
@@
-103,7
+124,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
@@
-166,4
+188,14
@@
class Job < ArvadosModel
end
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
end