From 071dd4970da733d4a44d9e9caabef80400f46e4f Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 31 Jul 2014 15:36:11 +0200 Subject: [PATCH] Always remove deprecated target-role meta on update of a primitive We deprecated setting target-role values via the meta attribute, in favor of :start/:stop actions on the resource. So this should not be relied upon anymore, and it's safe to drop this if we want to. There is one racy case where this matters: - node1 and node2 try to create a primitive with the chef resource; on initial creation, we set target-role='Stopped' because we do not want to autostart primitives. - because they can't create it at the same time, node2 will fail on creation. If the chef resource is configured to retry, then node2 will then try to update the primitive (since it now exists); but the chef resource is not reloaded so still has target-role='Stopped'. - if node1 had also started the primitive before node2 retries the :create, then the target-role will be changed from 'Started' to 'Stopped' with the update. This can result in a primitive not being started with [:create, :start]. Therefore, we just delete this deprecated bit from meta to avoid any issue. [Thu, 31 Jul 2014 15:11:55 +0200] INFO: Processing pacemaker_primitive[vip-public-cluster-proposal-1] action create (crowbar-pacemaker::haproxy line 15) [Thu, 31 Jul 2014 15:11:56 +0200] INFO: Creating new primitive resource 'vip-public-cluster-proposal-1' [Thu, 31 Jul 2014 15:11:56 +0200] INFO: Processing execute[crm configure primitive vip-public-cluster-proposal-1 ocf:heartbeat:IPaddr2 params ip="192.168.126.5" meta target-role="Stopped" ] action run (/var/chef/cache/cookbooks/pacemaker/libraries/chef/mixin/pacemaker/sta ndard_cib_object.rb line 91) ================================================================================ Error executing action `run` on resource 'execute[crm configure primitive vip-public-cluster-proposal-1 ocf:heartbeat:IPaddr2 params ip="192.168.126.5" meta target-role="Stopped" ]' ================================================================================ Mixlib::ShellOut::ShellCommandFailed ------------------------------------ Expected process to exit with [0], but received '1' ---- Begin output of crm configure primitive vip-public-cluster-proposal-1 ocf:heartbeat:IPaddr2 params ip="192.168.126.5" meta target-role="Stopped" ---- STDOUT: STDERR: ERROR: vip-public-cluster-proposal-1: id is already in use ---- End output of crm configure primitive vip-public-cluster-proposal-1 ocf:heartbeat:IPaddr2 params ip="192.168.126.5" meta target-role="Stopped" ---- Ran crm configure primitive vip-public-cluster-proposal-1 ocf:heartbeat:IPaddr2 params ip="192.168.126.5" meta target-role="Stopped" returned 1 [...] [Thu, 31 Jul 2014 15:11:56 +0200] INFO: Retrying execution of pacemaker_primitive[vip-public-cluster-proposal-1], 0 attempt(s) left [Thu, 31 Jul 2014 15:12:02 +0200] INFO: Checking existing primitive resource 'vip-public-cluster-proposal-1' for modifications [Thu, 31 Jul 2014 15:12:02 +0200] INFO: vip-public-cluster-proposal-1's ip params didn't change [Thu, 31 Jul 2014 15:12:02 +0200] INFO: vip-public-cluster-proposal-1's target-role meta changed from to Stopped [Thu, 31 Jul 2014 15:12:02 +0200] INFO: Processing execute[crm_resource --resource vip-public-cluster-proposal-1 --set-parameter "target-role" --parameter-value "Stopped" --meta] action run (/var/chef/cache/cookbooks/pacemaker/providers/primitive.rb line 88) [Thu, 31 Jul 2014 15:12:02 +0200] INFO: execute[crm_resource --resource vip-public-cluster-proposal-1 --set-parameter "target-role" --parameter-value "Stopped" --meta] ran successfully [Thu, 31 Jul 2014 15:12:02 +0200] INFO: Processing execute[crm configure primitive vip-public-cluster-proposal-1 ocf:heartbeat:IPaddr2 params ip="192.168.126.5" meta target-role="Stopped" ] action nothing (/var/chef/cache/cookbooks/pacemaker/libraries/chef/mixin/pacemaker /standard_cib_object.rb line 91) [Thu, 31 Jul 2014 15:12:02 +0200] INFO: Processing execute[crm_resource --resource vip-public-cluster-proposal-1 --set-parameter "target-role" --parameter-value "Stopped" --meta] action nothing (/var/chef/cache/cookbooks/pacemaker/providers/primitive.rb line 88) --- providers/primitive.rb | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/providers/primitive.rb b/providers/primitive.rb index 5206a35..9bb7ead 100644 --- a/providers/primitive.rb +++ b/providers/primitive.rb @@ -71,11 +71,34 @@ def create_resource(name) end def maybe_modify_resource(name) + deprecate_target_role + Chef::Log.info "Checking existing #{@current_cib_object} for modifications" cmds = [] desired_primitive = cib_object_class.from_chef_resource(new_resource) + + # We deprecated setting target-role values via the meta attribute, in favor + # of :start/:stop actions on the resource. So this should not be relied upon + # anymore, and it's safe to drop this if we want to. + # + # There is one racy case where this matters: + # - node1 and node2 try to create a primitive with the chef resource; + # on initial creation, we set target-role='Stopped' because we do not + # want to autostart primitives. + # - because they can't create it at the same time, node2 will fail on + # creation. If the chef resource is configured to retry, then node2 will + # then try to update the primitive (since it now exists); but the chef + # resource is not reloaded so still has target-role='Stopped'. + # - if node1 had also started the primitive before node2 retries the + # :create, then the target-role will be changed from 'Started' to + # 'Stopped' with the update. + # + # This can result in a primitive not being started with [:create, :start]. + # Therefore, we just delete this deprecated bit from meta to avoid any issue. + desired_primitive.meta.delete('target-role') + if desired_primitive.op_string != @current_cib_object.op_string Chef::Log.debug "op changed from [#{@current_cib_object.op_string}] to [#{desired_primitive.op_string}]" cmds = [desired_primitive.reconfigure_command]