projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '9827-no-docker-caching' closes #9827
[arvados.git]
/
services
/
api
/
app
/
controllers
/
arvados
/
v1
/
nodes_controller.rb
diff --git
a/services/api/app/controllers/arvados/v1/nodes_controller.rb
b/services/api/app/controllers/arvados/v1/nodes_controller.rb
index 44197a054feba0176091b6e7e6aabcb640b84f11..5e2404e62c4db63360ddf91f5a6f1c801c763ce3 100644
(file)
--- a/
services/api/app/controllers/arvados/v1/nodes_controller.rb
+++ b/
services/api/app/controllers/arvados/v1/nodes_controller.rb
@@
-3,6
+3,8
@@
class Arvados::V1::NodesController < ApplicationController
skip_before_filter :find_object_by_uuid, :only => :ping
skip_before_filter :render_404_if_no_object, :only => :ping
skip_before_filter :find_object_by_uuid, :only => :ping
skip_before_filter :render_404_if_no_object, :only => :ping
+ include DbCurrentTime
+
def update
if resource_attrs[:job_uuid]
@object.job_readable = readable_job_uuids(resource_attrs[:job_uuid]).any?
def update
if resource_attrs[:job_uuid]
@object.job_readable = readable_job_uuids(resource_attrs[:job_uuid]).any?
@@
-21,7
+23,7
@@
class Arvados::V1::NodesController < ApplicationController
return render_not_found
end
ping_data = {
return render_not_found
end
ping_data = {
- ip: params[:local_ipv4] || request.
env['REMOTE_ADDR']
,
+ ip: params[:local_ipv4] || request.
remote_ip
,
ec2_instance_id: params[:instance_id]
}
[:ping_secret, :total_cpu_cores, :total_ram_mb, :total_scratch_mb]
ec2_instance_id: params[:instance_id]
}
[:ping_secret, :total_cpu_cores, :total_ram_mb, :total_scratch_mb]
@@
-41,7
+43,7
@@
class Arvados::V1::NodesController < ApplicationController
if !current_user.andand.is_admin && current_user.andand.is_active
# active non-admin users can list nodes that are (or were
# recently) working
if !current_user.andand.is_admin && current_user.andand.is_active
# active non-admin users can list nodes that are (or were
# recently) working
- @objects = model_class.where('last_ping_at >= ?',
Time.now
- 1.hours)
+ @objects = model_class.where('last_ping_at >= ?',
db_current_time
- 1.hours)
end
super
job_uuids = @objects.map { |n| n[:job_uuid] }.compact
end
super
job_uuids = @objects.map { |n| n[:job_uuid] }.compact