Merge branch '13383-trash-workers'

[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 73f1dee54ad31a1ed908b4fd4bee2c3f3d3f7b8f..a2b22ea7f6c55709dff9d745368cbbe46bed5669 100644 (file)
--- a/services/api/app/controllers/arvados/v1/nodes_controller.rb
+++ b/services/api/app/controllers/arvados/v1/nodes_controller.rb
@@ -9,13 +9,6 @@ class Arvados::V1::NodesController < ApplicationController
 
   include DbCurrentTime
 
-  def update
-    if resource_attrs[:job_uuid].is_a? String
-      @object.job_readable = readable_job_uuids([resource_attrs[:job_uuid]]).any?
-    end
-    super
-  end
-
   def self._ping_requires_parameters
     { ping_secret: {required: true} }
   end
@@ -38,11 +31,15 @@ class Arvados::V1::NodesController < ApplicationController
   end
 
   def update
+    if resource_attrs[:job_uuid].is_a? String
+      @object.job_readable = readable_job_uuids([resource_attrs[:job_uuid]]).any?
+    end
     attrs_to_update = resource_attrs.reject { |k,v|
       [:kind, :etag, :href].index k
     }
     @object.update_attributes!(attrs_to_update)
     @object.assign_slot if params[:assign_slot]
+    @object.save!
     show
   end