X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/6eb3d1fb8fe71623fa63da46c250184cf2e4fbb8..HEAD:/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 deleted file mode 100644 index 4ab5695a2f..0000000000 --- a/services/api/app/controllers/arvados/v1/nodes_controller.rb +++ /dev/null @@ -1,61 +0,0 @@ -class Arvados::V1::NodesController < ApplicationController - skip_before_filter :require_auth_scope, :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? - end - super - end - - def self._ping_requires_parameters - { ping_secret: {required: true} } - end - - def ping - act_as_system_user do - @object = Node.where(uuid: (params[:id] || params[:uuid])).first - if !@object - return render_not_found - end - ping_data = { - ip: params[:local_ipv4] || request.env['REMOTE_ADDR'], - ec2_instance_id: params[:instance_id] - } - [:ping_secret, :total_cpu_cores, :total_ram_mb, :total_scratch_mb] - .each do |key| - ping_data[key] = params[key] if params[key] - end - @object.ping(ping_data) - if @object.info['ping_secret'] == params[:ping_secret] - send_json @object.as_api_response(:superuser) - else - raise "Invalid ping_secret after ping" - end - end - end - - def find_objects_for_index - 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 >= ?', db_current_time - 1.hours) - end - super - job_uuids = @objects.map { |n| n[:job_uuid] }.compact - assoc_jobs = readable_job_uuids(job_uuids) - @objects.each do |node| - node.job_readable = assoc_jobs.include?(node[:job_uuid]) - end - end - - protected - - def readable_job_uuids(*uuids) - Job.readable_by(*@read_users).select(:uuid).where(uuid: uuids).map(&:uuid) - end -end