No OneTemporary
Actions

Size

55 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/crm/pengine/clone.c b/crm/pengine/clone.c
	index 46b7cadf62..4abfc2f8e7 100644
	--- a/crm/pengine/clone.c
	+++ b/crm/pengine/clone.c
	@@ -1,1308 +1,1317 @@
	/*
	* Copyright (C) 2004 Andrew Beekhof <andrew@beekhof.net>
	*
	* This program is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public
	* License as published by the Free Software Foundation; either
	* version 2.1 of the License, or (at your option) any later version.
	*
	* This software is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* General Public License for more details.
	*
	* You should have received a copy of the GNU General Public
	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
	*/

	#include <portability.h>

	#include <crm/msg_xml.h>
	#include <allocate.h>
	#include <utils.h>
	#include <lib/crm/pengine/utils.h>

	#define VARIANT_CLONE 1
	#include <lib/crm/pengine/variant.h>

	gint sort_clone_instance(gconstpointer a, gconstpointer b);

	void clone_create_notifications(
	resource_t rsc, action_t action, action_t *action_complete,
	pe_working_set_t *data_set);

	void child_stopping_constraints(
	clone_variant_data_t *clone_data, enum pe_ordering type,
	resource_t child, resource_t last, pe_working_set_t *data_set);

	void child_starting_constraints(
	clone_variant_data_t *clone_data, enum pe_ordering type,
	resource_t child, resource_t last, pe_working_set_t *data_set);

	void clone_set_cmds(resource_t *rsc)
	{
	clone_variant_data_t *clone_data = NULL;
	get_clone_variant_data(clone_data, rsc);
	clone_data->self->cmds = &resource_class_alloc_functions[clone_data->self->variant];
	slist_iter(
	child_rsc, resource_t, clone_data->child_list, lpc,
	child_rsc->cmds = &resource_class_alloc_functions[child_rsc->variant];
	child_rsc->cmds->set_cmds(child_rsc);
	);
	}

	int clone_num_allowed_nodes(resource_t *rsc)
	{
	int num_nodes = 0;
	clone_variant_data_t *clone_data = NULL;
	get_clone_variant_data(clone_data, rsc);

	/* what should we return here? */
	slist_iter(
	child_rsc, resource_t, clone_data->child_list, lpc,
	int tmp_num_nodes = child_rsc->cmds->num_allowed_nodes(child_rsc);
	if(tmp_num_nodes > num_nodes) {
	num_nodes = tmp_num_nodes;
	}
	);

	return num_nodes;
	}

	static node_t *
	parent_node_instance(const resource_t rsc, node_t node)
	{
	node_t *ret = NULL;
	clone_variant_data_t *clone_data = NULL;
	if(node != NULL) {
	get_clone_variant_data(clone_data, rsc->parent);
	ret = pe_find_node_id(
	clone_data->self->allowed_nodes, node->details->id);
	}
	return ret;
	}

	gint sort_clone_instance(gconstpointer a, gconstpointer b)
	{
	int level = LOG_DEBUG_3;
	node_t *node1 = NULL;
	node_t *node2 = NULL;

	gboolean can1 = TRUE;
	gboolean can2 = TRUE;

	const resource_t resource1 = (const resource_t)a;
	const resource_t resource2 = (const resource_t)b;

	CRM_ASSERT(resource1 != NULL);
	CRM_ASSERT(resource2 != NULL);

	/* allocation order:
	* - active instances
	* - instances running on nodes with the least copies
	* - active instances on nodes that cant support them or are to be fenced
	* - failed instances
	* - inactive instances
	*/

	do_crm_log(level, "%s ? %s", resource1->id, resource2->id);
	if(resource1->running_on && resource2->running_on) {
	if(g_list_length(resource1->running_on) < g_list_length(resource2->running_on)) {
	do_crm_log(level, "%s < %s: running_on", resource1->id, resource2->id);
	return -1;

	} else if(g_list_length(resource1->running_on) > g_list_length(resource2->running_on)) {
	do_crm_log(level, "%s > %s: running_on", resource1->id, resource2->id);
	return 1;
	}
	}

	if(resource1->running_on) {
	node1 = resource1->running_on->data;
	}
	if(resource2->running_on) {
	node2 = resource2->running_on->data;
	}

	if(node1 != node2) {
	if(node1 == NULL) {
	do_crm_log(level, "%s > %s: active", resource1->id, resource2->id);
	return 1;
	} else if(node2 == NULL) {
	do_crm_log(level, "%s < %s: active", resource1->id, resource2->id);
	return -1;
	}
	}

	can1 = can_run_resources(node1);
	can2 = can_run_resources(node2);
	if(can1 != can2) {
	if(can1) {
	do_crm_log(level, "%s < %s: can", resource1->id, resource2->id);
	return -1;
	}
	do_crm_log(level, "%s > %s: can", resource1->id, resource2->id);
	return 1;
	}

	node1 = parent_node_instance(resource1, node1);
	node2 = parent_node_instance(resource2, node2);
	if(node1 != NULL && node2 == NULL) {
	do_crm_log(level, "%s < %s: not allowed", resource1->id, resource2->id);
	return -1;
	} else if(node1 == NULL && node2 != NULL) {
	do_crm_log(level, "%s > %s: not allowed", resource1->id, resource2->id);
	return 1;
	}

	if(node1 == NULL) {
	do_crm_log(level, "%s == %s: not allowed", resource1->id, resource2->id);
	return 0;
	}

	if(node1->count < node2->count) {
	do_crm_log(level, "%s < %s: count", resource1->id, resource2->id);
	return -1;

	} else if(node1->count > node2->count) {
	do_crm_log(level, "%s > %s: count", resource1->id, resource2->id);
	return 1;
	}

	+ if(node1->weight < node2->weight) {
	+ do_crm_log(level, "%s < %s: score", resource1->id, resource2->id);
	+ return 1;
	+
	+ } else if(node1->weight > node2->weight) {
	+ do_crm_log(level, "%s > %s: score", resource1->id, resource2->id);
	+ return -1;
	+ }
	+
	do_crm_log(level, "%s == %s: default", resource1->id, resource2->id);
	return 0;
	}

	static node_t *
	can_run_instance(resource_t rsc, node_t node)
	{
	node_t *local_node = NULL;
	clone_variant_data_t *clone_data = NULL;
	if(can_run_resources(node) == FALSE) {
	goto bail;
	}

	local_node = parent_node_instance(rsc, node);
	get_clone_variant_data(clone_data, rsc->parent);

	if(local_node == NULL) {
	crm_warn("%s cannot run on %s: node not allowed",
	rsc->id, node->details->uname);
	goto bail;

	} else if(local_node->count < clone_data->clone_node_max) {
	return local_node;

	} else {
	crm_debug_2("%s cannot run on %s: node full",
	rsc->id, node->details->uname);
	}

	bail:
	if(node) {
	node->weight = -INFINITY;
	}
	return NULL;
	}


	static node_t *
	color_instance(resource_t rsc, pe_working_set_t data_set)
	{
	node_t *local_node = NULL;
	node_t *chosen = NULL;

	crm_debug("Processing %s", rsc->id);

	if(rsc->provisional == FALSE) {
	return rsc->allocated_to;

	} else if(rsc->is_allocating) {
	crm_debug("Dependancy loop detected involving %s", rsc->id);
	return NULL;
	}

	if(rsc->allowed_nodes) {
	slist_iter(try_node, node_t, rsc->allowed_nodes, lpc,
	if(can_run_instance(rsc, try_node) == NULL) {
	try_node->weight = -INFINITY;
	}
	);
	}

	chosen = rsc->cmds->color(rsc, data_set);
	if(chosen) {
	clone_variant_data_t *clone_data = NULL;
	get_clone_variant_data(clone_data, rsc->parent);

	local_node = pe_find_node_id(
	clone_data->self->allowed_nodes, chosen->details->id);

	CRM_ASSERT(local_node);
	local_node->count++;
	}

	return chosen;
	}


	node_t *
	clone_color(resource_t rsc, pe_working_set_t data_set)
	{
	int allocated = 0;
	resource_t *first_child = NULL;
	clone_variant_data_t *clone_data = NULL;
	get_clone_variant_data(clone_data, rsc);

	if(rsc->provisional == FALSE) {
	return NULL;

	} else if(rsc->is_allocating) {
	crm_debug("Dependancy loop detected involving %s", rsc->id);
	return NULL;
	}

	rsc->is_allocating = TRUE;
	crm_debug("Processing %s", rsc->id);

	if(rsc->stickiness) {
	/* count now tracks the number of clones currently allocated */
	slist_iter(node, node_t, clone_data->self->allowed_nodes, lpc,
	node->count = 0;
	);

	slist_iter(child, resource_t, clone_data->child_list, lpc,
	if(g_list_length(child->running_on) > 0) {
	node_t *child_node = child->running_on->data;
	node_t *local_node = parent_node_instance(
	child, child->running_on->data);
	if(local_node) {
	local_node->count++;
	} else {
	crm_err("%s is running on %s which isn't allowed",
	child->id, child_node->details->uname);
	}
	}
	);

	clone_data->child_list = g_list_sort(
	clone_data->child_list, sort_clone_instance);
	}

	/* count now tracks the number of clones we have allocated */
	slist_iter(node, node_t, clone_data->self->allowed_nodes, lpc,
	node->count = 0;
	);


	first_child = clone_data->child_list->data;
	first_child->rsc_cons = g_list_concat(
	first_child->rsc_cons, rsc->rsc_cons);
	rsc->rsc_cons = NULL;

	clone_data->self->allowed_nodes = g_list_sort(
	clone_data->self->allowed_nodes, sort_node_weight);


	slist_iter(child, resource_t, clone_data->child_list, lpc,
	if(allocated >= clone_data->clone_max) {
	crm_debug("Child %s not allocated - limit reached", child->id);
	resource_location(child, NULL, -INFINITY, "clone_color:limit_reached", data_set);
	}
	if(color_instance(child, data_set)) {
	allocated++;
	}
	);

	crm_debug("Allocated %d %s instances of a possible %d",
	allocated, rsc->id, clone_data->clone_max);

	rsc->provisional = FALSE;
	rsc->is_allocating = FALSE;

	return NULL;
	}

	static void
	clone_update_pseudo_status(
	resource_t child, gboolean stopping, gboolean *starting)
	{
	CRM_ASSERT(stopping != NULL);
	CRM_ASSERT(starting != NULL);

	slist_iter(
	action, action_t, child->actions, lpc,

	if(starting && stopping) {
	return;

	} else if(action->optional) {
	crm_debug_3("Skipping optional: %s", action->uuid);
	continue;

	} else if(action->pseudo == FALSE && action->runnable == FALSE){
	crm_debug_3("Skipping unrunnable: %s", action->uuid);
	continue;

	} else if(safe_str_eq(CRMD_ACTION_STOP, action->task)) {
	crm_debug_2("Stopping due to: %s", action->uuid);
	*stopping = TRUE;

	} else if(safe_str_eq(CRMD_ACTION_START, action->task)) {
	if(action->runnable == FALSE) {
	crm_debug_3("Skipping pseudo-op: %s run=%d, pseudo=%d",
	action->uuid, action->runnable, action->pseudo);
	} else {
	crm_debug_2("Starting due to: %s", action->uuid);
	crm_debug_3("%s run=%d, pseudo=%d",
	action->uuid, action->runnable, action->pseudo);
	*starting = TRUE;
	}
	}
	);

	}

	void clone_create_actions(resource_t rsc, pe_working_set_t data_set)
	{
	gboolean child_starting = FALSE;
	gboolean child_stopping = FALSE;
	action_t *stop = NULL;
	action_t *start = NULL;
	action_t *action_complete = NULL;
	resource_t *last_start_rsc = NULL;
	resource_t *last_stop_rsc = NULL;
	clone_variant_data_t *clone_data = NULL;

	get_clone_variant_data(clone_data, rsc);

	crm_debug_2("Creating actions for %s", rsc->id);

	slist_iter(
	child_rsc, resource_t, clone_data->child_list, lpc,
	child_rsc->cmds->create_actions(child_rsc, data_set);
	clone_update_pseudo_status(
	child_rsc, &child_stopping, &child_starting);

	if(child_rsc->starting) {
	last_start_rsc = child_rsc;
	}
	if(child_rsc->stopping) {
	last_stop_rsc = child_rsc;
	}
	);

	/* start */
	start = start_action(clone_data->self, NULL, !child_starting);
	action_complete = custom_action(
	clone_data->self, started_key(rsc),
	CRMD_ACTION_STARTED, NULL, !child_starting, TRUE, data_set);

	start->pseudo = TRUE;
	start->runnable = TRUE;
	action_complete->pseudo = TRUE;
	action_complete->runnable = TRUE;
	action_complete->priority = INFINITY;
	/* crm_err("Upgrading priority for %s to INFINITY", action_complete->uuid); */

	child_starting_constraints(clone_data, pe_order_optional,
	NULL, last_start_rsc, data_set);

	clone_create_notifications(
	rsc, start, action_complete, data_set);


	/* stop */
	stop = stop_action(clone_data->self, NULL, !child_stopping);
	action_complete = custom_action(
	clone_data->self, stopped_key(rsc),
	CRMD_ACTION_STOPPED, NULL, !child_stopping, TRUE, data_set);

	stop->pseudo = TRUE;
	stop->runnable = TRUE;
	action_complete->pseudo = TRUE;
	action_complete->runnable = TRUE;
	action_complete->priority = INFINITY;
	/* crm_err("Upgrading priority for %s to INFINITY", action_complete->uuid); */

	child_stopping_constraints(clone_data, pe_order_optional,
	NULL, last_stop_rsc, data_set);


	clone_create_notifications(rsc, stop, action_complete, data_set);
	rsc->actions = clone_data->self->actions;

	if(stop->post_notified != NULL && start->pre_notify != NULL) {
	order_actions(stop->post_notified, start->pre_notify, pe_order_optional);
	}
	}

	void
	clone_create_notifications(
	resource_t rsc, action_t action, action_t *action_complete,
	pe_working_set_t *data_set)
	{
	/*
	* pre_notify -> pre_notify_complete -> pseudo_action
	* -> (real actions) -> pseudo_action_complete
	* -> post_notify -> post_notify_complete
	*
	* if the pre_noitfy requires confirmation,
	* then a list of confirmations will be added as triggers
	* to pseudo_action in clone_expand()
	*/
	action_t *notify = NULL;
	action_t *notify_complete = NULL;
	enum action_tasks task;
	char *notify_key = NULL;
	clone_variant_data_t *clone_data = NULL;
	get_clone_variant_data(clone_data, rsc);

	if(rsc->notify == FALSE) {
	return;
	}

	task = text2task(action->task);

	/* create pre_notify */
	notify_key = generate_notify_key(
	clone_data->self->id, "pre", action->task);
	notify = custom_action(clone_data->self, notify_key,
	CRMD_ACTION_NOTIFY, NULL,
	action->optional, TRUE, data_set);

	add_hash_param(notify->meta, "notify_type", "pre");
	add_hash_param(notify->meta, "notify_operation", action->task);
	if(clone_data->notify_confirm) {
	add_hash_param(notify->meta, "notify_confirm", "yes");
	} else {
	add_hash_param(notify->meta, "notify_confirm", "no");
	}

	/* create pre_notify_complete */
	notify_key = generate_notify_key(
	clone_data->self->id, "confirmed-pre", action->task);
	notify_complete = custom_action(clone_data->self, notify_key,
	CRMD_ACTION_NOTIFIED, NULL,
	action->optional, TRUE, data_set);
	add_hash_param(notify_complete->meta, "notify_type", "pre");
	add_hash_param(notify_complete->meta, "notify_operation", action->task);
	if(clone_data->notify_confirm) {
	add_hash_param(notify->meta, "notify_confirm", "yes");
	} else {
	add_hash_param(notify->meta, "notify_confirm", "no");
	}
	notify->pseudo = TRUE;
	notify->runnable = TRUE;
	notify_complete->pseudo = TRUE;
	notify_complete->runnable = TRUE;

	/* pre_notify before pre_notify_complete */
	custom_action_order(
	clone_data->self, NULL, notify,
	clone_data->self, NULL, notify_complete,
	pe_order_implies_left, data_set);

	/* pre_notify_complete before action */
	custom_action_order(
	clone_data->self, NULL, notify_complete,
	clone_data->self, NULL, action,
	pe_order_implies_left, data_set);

	action->pre_notify = notify;
	action->pre_notified = notify_complete;

	/* create post_notify */
	notify_key = generate_notify_key
	(clone_data->self->id, "post", action->task);
	notify = custom_action(clone_data->self, notify_key,
	CRMD_ACTION_NOTIFY, NULL,
	action_complete->optional, TRUE, data_set);
	add_hash_param(notify->meta, "notify_type", "post");
	add_hash_param(notify->meta, "notify_operation", action->task);
	if(clone_data->notify_confirm) {
	add_hash_param(notify->meta, "notify_confirm", "yes");
	} else {
	add_hash_param(notify->meta, "notify_confirm", "no");
	}

	/* action_complete before post_notify */
	custom_action_order(
	clone_data->self, NULL, action_complete,
	clone_data->self, NULL, notify,
	pe_order_postnotify, data_set);

	/* create post_notify_complete */
	notify_key = generate_notify_key(
	clone_data->self->id, "confirmed-post", action->task);
	notify_complete = custom_action(clone_data->self, notify_key,
	CRMD_ACTION_NOTIFIED, NULL,
	action->optional, TRUE, data_set);
	add_hash_param(notify_complete->meta, "notify_type", "pre");
	add_hash_param(notify_complete->meta, "notify_operation", action->task);
	if(clone_data->notify_confirm) {
	add_hash_param(notify->meta, "notify_confirm", "yes");
	} else {
	add_hash_param(notify->meta, "notify_confirm", "no");
	}

	notify->pseudo = TRUE;
	notify->runnable = TRUE;
	notify->priority = INFINITY;
	/* crm_err("Upgrading priority for %s to INFINITY", notify->uuid); */

	notify_complete->pseudo = TRUE;
	notify_complete->runnable = TRUE;
	notify_complete->priority = INFINITY;
	/* crm_err("Upgrading priority for %s to INFINITY", notify_complete->uuid); */

	/* post_notify before post_notify_complete */
	custom_action_order(
	clone_data->self, NULL, notify,
	clone_data->self, NULL, notify_complete,
	pe_order_implies_left, data_set);

	action->post_notify = notify;
	action->post_notified = notify_complete;


	if(safe_str_eq(action->task, CRMD_ACTION_STOP)) {
	/* post_notify_complete before start */
	custom_action_order(
	clone_data->self, NULL, notify_complete,
	clone_data->self, start_key(clone_data->self), NULL,
	pe_order_optional, data_set);

	} else if(safe_str_eq(action->task, CRMD_ACTION_START)) {
	/* post_notify_complete before promote */
	custom_action_order(
	clone_data->self, NULL, notify_complete,
	clone_data->self, promote_key(clone_data->self), NULL,
	pe_order_optional, data_set);

	} else if(safe_str_eq(action->task, CRMD_ACTION_DEMOTE)) {
	/* post_notify_complete before promote */
	custom_action_order(
	clone_data->self, NULL, notify_complete,
	clone_data->self, stop_key(clone_data->self), NULL,
	pe_order_optional, data_set);
	}
	}

	void
	child_starting_constraints(
	clone_variant_data_t *clone_data, enum pe_ordering type,
	resource_t child, resource_t last, pe_working_set_t *data_set)
	{
	if(clone_data->ordered
	\|\| clone_data->self->restart_type == pe_restart_restart) {
	type = pe_order_implies_left;
	}
	if(child == NULL) {
	if(clone_data->ordered && last != NULL) {
	crm_debug_4("Ordered version (last node)");
	/* last child start before global started */
	custom_action_order(
	last, start_key(last), NULL,
	clone_data->self, started_key(clone_data->self), NULL,
	type, data_set);
	}

	} else if(clone_data->ordered) {
	crm_debug_4("Ordered version");
	if(last == NULL) {
	/* global start before first child start */
	last = clone_data->self;

	} /* else: child/child relative start */

	order_start_start(last, child, type);

	} else {
	crm_debug_4("Un-ordered version");

	/* child start before global started */
	custom_action_order(
	child, start_key(child), NULL,
	clone_data->self, started_key(clone_data->self), NULL,
	type, data_set);

	/* global start before child start */
	/* order_start_start(clone_data->self, child, type); */
	order_start_start(
	clone_data->self, child, pe_order_implies_left);
	}
	}

	void
	child_stopping_constraints(
	clone_variant_data_t *clone_data, enum pe_ordering type,
	resource_t child, resource_t last, pe_working_set_t *data_set)
	{
	if(clone_data->ordered
	\|\| clone_data->self->restart_type == pe_restart_restart) {
	type = pe_order_implies_left;
	}

	if(child == NULL) {
	if(clone_data->ordered && last != NULL) {
	crm_debug_4("Ordered version (last node)");
	/* global stop before first child stop */
	order_stop_stop(clone_data->self, last,
	pe_order_implies_left);
	}

	} else if(clone_data->ordered && last != NULL) {
	crm_debug_4("Ordered version");

	/* child/child relative stop */
	order_stop_stop(child, last, type);

	} else if(clone_data->ordered) {
	crm_debug_4("Ordered version (1st node)");
	/* first child stop before global stopped */
	custom_action_order(
	child, stop_key(child), NULL,
	clone_data->self, stopped_key(clone_data->self), NULL,
	type, data_set);

	} else {
	crm_debug_4("Un-ordered version");

	/* child stop before global stopped */
	custom_action_order(
	child, stop_key(child), NULL,
	clone_data->self, stopped_key(clone_data->self), NULL,
	type, data_set);

	/* global stop before child stop */
	order_stop_stop(clone_data->self, child, type);
	}
	}


	void
	clone_internal_constraints(resource_t rsc, pe_working_set_t data_set)
	{
	resource_t *last_rsc = NULL;
	clone_variant_data_t *clone_data = NULL;
	get_clone_variant_data(clone_data, rsc);

	clone_data->self->cmds->internal_constraints(clone_data->self, data_set);

	/* global stop before stopped */
	custom_action_order(
	clone_data->self, stop_key(clone_data->self), NULL,
	clone_data->self, stopped_key(clone_data->self), NULL,
	pe_order_optional, data_set);

	/* global start before started */
	custom_action_order(
	clone_data->self, start_key(clone_data->self), NULL,
	clone_data->self, started_key(clone_data->self), NULL,
	pe_order_optional, data_set);

	/* global stopped before start */
	custom_action_order(
	clone_data->self, stopped_key(clone_data->self), NULL,
	clone_data->self, start_key(clone_data->self), NULL,
	pe_order_optional, data_set);

	slist_iter(
	child_rsc, resource_t, clone_data->child_list, lpc,

	child_rsc->cmds->internal_constraints(child_rsc, data_set);

	child_starting_constraints(
	clone_data, pe_order_optional,
	child_rsc, last_rsc, data_set);

	child_stopping_constraints(
	clone_data, pe_order_optional,
	child_rsc, last_rsc, data_set);

	last_rsc = child_rsc;

	);

	child_starting_constraints(
	clone_data, pe_order_optional,
	NULL, last_rsc, data_set);

	child_stopping_constraints(
	clone_data, pe_order_optional,
	NULL, last_rsc, data_set);
	}

	static resource_t*
	find_compatible_child(resource_t local_child, resource_t rsc)
	{
	node_t *local_node = NULL;
	node_t *node = NULL;
	clone_variant_data_t *clone_data = NULL;
	get_clone_variant_data(clone_data, rsc);

	local_node = local_child->allocated_to;
	if(local_node == NULL) {
	crm_debug("Can't colocate unrunnable child %s with %s",
	local_child->id, rsc->id);
	return NULL;
	}

	slist_iter(
	child_rsc, resource_t, clone_data->child_list, lpc,
	node = child_rsc->allocated_to;
	if(node->details == local_node->details) {
	crm_info("Colocating %s with %s on %s",
	local_child->id, child_rsc->id, node->details->uname);
	return child_rsc;
	}
	);
	crm_debug("Can't colocate child %s with %s",
	local_child->id, rsc->id);
	return NULL;
	}

	void clone_rsc_colocation_lh(
	resource_t rsc_lh, resource_t rsc_rh, rsc_colocation_t *constraint)
	{
	gboolean do_interleave = FALSE;
	resource_t *rsc = constraint->rsc_lh;
	clone_variant_data_t *clone_data = NULL;
	clone_variant_data_t *clone_data_rh = NULL;

	if(rsc == NULL) {
	pe_err("rsc_lh was NULL for %s", constraint->id);
	return;

	} else if(constraint->rsc_rh == NULL) {
	pe_err("rsc_rh was NULL for %s", constraint->id);
	return;

	} else {
	crm_debug_4("Processing constraints from %s", rsc->id);
	}

	get_clone_variant_data(clone_data, rsc);

	if(constraint->rsc_rh->variant == pe_clone) {
	get_clone_variant_data(
	clone_data_rh, constraint->rsc_rh);
	if(clone_data->clone_node_max
	!= clone_data_rh->clone_node_max) {
	crm_config_err("Cannot interleave "XML_CIB_TAG_INCARNATION
	" %s and %s because"
	" they do not support the same number of"
	" resources per node",
	constraint->rsc_lh->id, constraint->rsc_rh->id);

	/* only the LHS side needs to be labeled as interleave */
	} else if(clone_data->interleave) {
	do_interleave = TRUE;

	} else if(constraint->score >= INFINITY) {
	GListPtr lhs = NULL, rhs = NULL;
	lhs = rsc_lh->allowed_nodes;

	slist_iter(
	child_rsc, resource_t, clone_data_rh->child_list, lpc,
	if(child_rsc->allocated_to != NULL) {
	rhs = g_list_append(rhs, child_rsc->allocated_to);
	}
	);

	rsc_lh->allowed_nodes = node_list_and(lhs, rhs, FALSE);

	pe_free_shallow_adv(rhs, FALSE);
	pe_free_shallow(lhs);
	return;
	}

	} else if(constraint->score >= INFINITY) {
	crm_config_err("Manditory co-location of clones (%s) with other"
	" non-clone (%s) resources is not supported",
	rsc_lh->id, rsc_rh->id);
	return;
	}

	if(do_interleave) {
	resource_t *rh_child = NULL;

	slist_iter(lh_child, resource_t, clone_data->child_list, lpc,

	CRM_ASSERT(lh_child != NULL);
	rh_child = find_compatible_child(lh_child, rsc_rh);
	if(rh_child == NULL) {
	continue;
	}
	lh_child->cmds->rsc_colocation_lh(
	lh_child, rh_child, constraint);
	);
	return;
	}

	slist_iter(
	child_rsc, resource_t, clone_data->child_list, lpc,

	child_rsc->cmds->rsc_colocation_lh(child_rsc, constraint->rsc_rh, constraint);
	);
	}



	void clone_rsc_colocation_rh(
	resource_t rsc_lh, resource_t rsc_rh, rsc_colocation_t *constraint)
	{
	clone_variant_data_t *clone_data = NULL;
	CRM_CHECK(rsc_lh != NULL, return);
	CRM_CHECK(rsc_lh->variant == pe_native, return);

	get_clone_variant_data(clone_data, rsc_rh);

	crm_debug_3("Processing constraint %s: %d", constraint->id, constraint->score);

	if(rsc_rh == NULL) {
	pe_err("rsc_rh was NULL for %s", constraint->id);
	return;

	} else if(rsc_rh->provisional) {
	crm_debug_3("%s is still provisional", rsc_rh->id);
	return;

	} else if(constraint->score >= INFINITY) {
	GListPtr lhs = NULL, rhs = NULL;
	lhs = rsc_lh->allowed_nodes;

	slist_iter(
	child_rsc, resource_t, clone_data->child_list, lpc,
	if(child_rsc->allocated_to != NULL) {
	rhs = g_list_append(rhs, child_rsc->allocated_to);
	}
	);

	rsc_lh->allowed_nodes = node_list_and(lhs, rhs, FALSE);

	pe_free_shallow_adv(rhs, FALSE);
	pe_free_shallow(lhs);
	return;
	}

	slist_iter(
	child_rsc, resource_t, clone_data->child_list, lpc,

	child_rsc->cmds->rsc_colocation_rh(rsc_lh, child_rsc, constraint);
	);
	}


	void clone_rsc_order_lh(resource_t rsc, order_constraint_t order)
	{
	clone_variant_data_t *clone_data = NULL;
	get_clone_variant_data(clone_data, rsc);

	crm_debug_2("%s->%s", order->lh_action_task, order->rh_action_task);

	convert_non_atomic_task(rsc, order);
	clone_data->self->cmds->rsc_order_lh(clone_data->self, order);
	}

	void clone_rsc_order_rh(
	action_t lh_action, resource_t rsc, order_constraint_t *order)
	{
	clone_variant_data_t *clone_data = NULL;
	get_clone_variant_data(clone_data, rsc);

	crm_debug_2("%s->%s", lh_action->uuid, order->rh_action_task);

	clone_data->self->cmds->rsc_order_rh(lh_action, clone_data->self, order);

	}

	void clone_rsc_location(resource_t rsc, rsc_to_node_t constraint)
	{
	clone_variant_data_t *clone_data = NULL;
	get_clone_variant_data(clone_data, rsc);

	crm_debug_3("Processing location constraint %s for %s",
	constraint->id, rsc->id);

	clone_data->self->cmds->rsc_location(clone_data->self, constraint);
	slist_iter(
	child_rsc, resource_t, clone_data->child_list, lpc,

	child_rsc->cmds->rsc_location(child_rsc, constraint);
	);
	}

	static gint
	sort_notify_entries(gconstpointer a, gconstpointer b)
	{
	int tmp;
	const notify_entry_t *entry_a = a;
	const notify_entry_t *entry_b = b;

	if(entry_a == NULL && entry_b == NULL) { return 0; }
	if(entry_a == NULL) { return 1; }
	if(entry_b == NULL) { return -1; }

	if(entry_a->rsc == NULL && entry_b->rsc == NULL) { return 0; }
	if(entry_a->rsc == NULL) { return 1; }
	if(entry_b->rsc == NULL) { return -1; }

	tmp = strcmp(entry_a->rsc->id, entry_b->rsc->id);
	if(tmp != 0) {
	return tmp;
	}

	if(entry_a->node == NULL && entry_b->node == NULL) { return 0; }
	if(entry_a->node == NULL) { return 1; }
	if(entry_b->node == NULL) { return -1; }

	return strcmp(entry_a->node->details->id, entry_b->node->details->id);
	}

	static void
	expand_list(GListPtr list, int clones,
	char rsc_list, char node_list, char **uuid_list)
	{
	const char *uname = NULL;
	const char *rsc_id = NULL;
	const char *last_rsc_id = NULL;

	CRM_CHECK(list != NULL, return);
	if(rsc_list) {
	CRM_CHECK(rsc_list == NULL, rsc_list = NULL);
	}
	if(node_list) {
	CRM_CHECK(node_list == NULL, node_list = NULL);
	}

	slist_iter(entry, notify_entry_t, list, lpc,

	CRM_CHECK(entry != NULL, continue);
	rsc_id = entry->rsc->id;
	CRM_CHECK(rsc_id != NULL, rsc_id = "__none__");
	uname = NULL;
	if(entry->node) {
	uname = entry->node->details->uname;
	}
	CRM_CHECK(uname != NULL, uname = "__none__");

	/* filter dups */
	if(safe_str_eq(rsc_id, last_rsc_id)) {
	continue;
	}
	last_rsc_id = rsc_id;

	if(rsc_list != NULL) {
	int existing_len = 0;
	int len = 2 + strlen(rsc_id); /* +1 space, +1 EOS */
	if(rsc_list && *rsc_list) {
	existing_len = strlen(*rsc_list);
	}

	crm_debug_5("Adding %s (%dc) at offset %d",
	rsc_id, len-2, existing_len);
	crm_realloc(*rsc_list, len + existing_len);
	sprintf(*rsc_list + existing_len, "%s ", rsc_id);
	}

	if(node_list != NULL) {
	int existing_len = 0;
	int len = 2 + strlen(uname);
	if(node_list && *node_list) {
	existing_len = strlen(*node_list);
	}

	crm_debug_5("Adding %s (%dc) at offset %d",
	uname, len-2, existing_len);
	crm_realloc(*node_list, len + existing_len);
	sprintf(*node_list + existing_len, "%s ", uname);
	}
	);
	}

	void clone_expand(resource_t rsc, pe_working_set_t data_set)
	{
	char *rsc_list = NULL;
	char *node_list = NULL;
	char *uuid_list = NULL;

	notify_data_t *n_data = NULL;
	clone_variant_data_t *clone_data = NULL;
	get_clone_variant_data(clone_data, rsc);

	crm_malloc0(n_data, sizeof(notify_data_t));
	n_data->keys = g_hash_table_new_full(
	g_str_hash, g_str_equal,
	g_hash_destroy_str, g_hash_destroy_str);

	crm_debug_2("Processing actions from %s", rsc->id);


	if(rsc->notify) {
	slist_iter(
	child_rsc, resource_t, clone_data->child_list, lpc,

	slist_iter(
	op, action_t, clone_data->self->actions, lpc2,

	child_rsc->cmds->create_notify_element(
	child_rsc, op, n_data, data_set);
	);
	);
	}

	/* expand the notify data */
	if(rsc->notify && n_data->stop) {
	n_data->stop = g_list_sort(
	n_data->stop, sort_notify_entries);
	rsc_list = NULL; node_list = NULL;
	expand_list(n_data->stop, clone_data->clone_max,
	&rsc_list, &node_list, &uuid_list);
	g_hash_table_insert(
	n_data->keys,
	crm_strdup("notify_stop_resource"), rsc_list);
	g_hash_table_insert(
	n_data->keys,
	crm_strdup("notify_stop_uname"), node_list);
	}

	if(rsc->notify && n_data->start) {
	n_data->start = g_list_sort(
	n_data->start, sort_notify_entries);
	rsc_list = NULL; node_list = NULL;
	expand_list(n_data->start, clone_data->clone_max,
	&rsc_list, &node_list, &uuid_list);
	g_hash_table_insert(
	n_data->keys,
	crm_strdup("notify_start_resource"), rsc_list);
	g_hash_table_insert(
	n_data->keys,
	crm_strdup("notify_start_uname"), node_list);
	}

	if(rsc->notify && n_data->demote) {
	n_data->demote = g_list_sort(
	n_data->demote, sort_notify_entries);
	rsc_list = NULL; node_list = NULL;
	expand_list(n_data->demote, clone_data->clone_max,
	&rsc_list, &node_list, &uuid_list);
	g_hash_table_insert(
	n_data->keys,
	crm_strdup("notify_demote_resource"), rsc_list);
	g_hash_table_insert(
	n_data->keys,
	crm_strdup("notify_demote_uname"), node_list);
	}

	if(rsc->notify && n_data->promote) {
	n_data->promote = g_list_sort(
	n_data->promote, sort_notify_entries);
	rsc_list = NULL; node_list = NULL; uuid_list = NULL;
	expand_list(n_data->promote, clone_data->clone_max,
	&rsc_list, &node_list, &uuid_list);
	g_hash_table_insert(
	n_data->keys,
	crm_strdup("notify_promote_resource"), rsc_list);
	g_hash_table_insert(
	n_data->keys,
	crm_strdup("notify_promote_uname"), node_list);
	}

	if(rsc->notify && n_data->active) {
	n_data->active = g_list_sort(
	n_data->active, sort_notify_entries);
	rsc_list = NULL; node_list = NULL; uuid_list = NULL;
	expand_list(n_data->active, clone_data->clone_max,
	&rsc_list, &node_list, &uuid_list);
	g_hash_table_insert(
	n_data->keys,
	crm_strdup("notify_active_resource"), rsc_list);
	g_hash_table_insert(
	n_data->keys,
	crm_strdup("notify_active_uname"), node_list);
	}

	if(rsc->notify && n_data->slave) {
	n_data->slave = g_list_sort(
	n_data->slave, sort_notify_entries);
	rsc_list = NULL; node_list = NULL; uuid_list = NULL;
	expand_list(n_data->slave, clone_data->clone_max,
	&rsc_list, &node_list, &uuid_list);
	g_hash_table_insert(
	n_data->keys,
	crm_strdup("notify_slave_resource"), rsc_list);
	g_hash_table_insert(
	n_data->keys,
	crm_strdup("notify_slave_uname"), node_list);
	}

	if(rsc->notify && n_data->master) {
	n_data->master = g_list_sort(
	n_data->master, sort_notify_entries);
	rsc_list = NULL; node_list = NULL; uuid_list = NULL;
	expand_list(n_data->master, clone_data->clone_max,
	&rsc_list, &node_list, &uuid_list);
	g_hash_table_insert(
	n_data->keys,
	crm_strdup("notify_master_resource"), rsc_list);
	g_hash_table_insert(
	n_data->keys,
	crm_strdup("notify_master_uname"), node_list);
	}

	if(rsc->notify && n_data->inactive) {
	n_data->inactive = g_list_sort(
	n_data->inactive, sort_notify_entries);
	rsc_list = NULL; node_list = NULL; uuid_list = NULL;
	expand_list(n_data->inactive, clone_data->clone_max,
	&rsc_list, &node_list, &uuid_list);
	g_hash_table_insert(
	n_data->keys,
	crm_strdup("notify_inactive_resource"), rsc_list);
	g_hash_table_insert(
	n_data->keys,
	crm_strdup("notify_inactive_uname"), node_list);
	}

	/* yes, we DO need this second loop */
	slist_iter(
	child_rsc, resource_t, clone_data->child_list, lpc,

	child_rsc->cmds->expand(child_rsc, data_set);

	);

	/* slist_iter( */
	/* action, action_t, clone_data->self->actions, lpc2, */

	/* if(safe_str_eq(action->task, CRMD_ACTION_NOTIFY)) { */
	/* action->meta_xml = notify_xml; */
	/* } */
	/* ); */

	clone_data->self->cmds->expand(clone_data->self, data_set);

	/* destroy the notify_data */
	pe_free_shallow(n_data->stop);
	pe_free_shallow(n_data->start);
	pe_free_shallow(n_data->demote);
	pe_free_shallow(n_data->promote);
	pe_free_shallow(n_data->master);
	pe_free_shallow(n_data->slave);
	pe_free_shallow(n_data->active);
	pe_free_shallow(n_data->inactive);
	g_hash_table_destroy(n_data->keys);
	crm_free(n_data);
	}


	void
	clone_agent_constraints(resource_t *rsc)
	{
	clone_variant_data_t *clone_data = NULL;
	get_clone_variant_data(clone_data, rsc);

	slist_iter(
	child_rsc, resource_t, clone_data->child_list, lpc,

	child_rsc->cmds->agent_constraints(child_rsc);
	);
	}

	void
	clone_create_notify_element(resource_t rsc, action_t op,
	notify_data_t n_data, pe_working_set_t data_set)
	{
	clone_variant_data_t *clone_data = NULL;
	get_clone_variant_data(clone_data, rsc);

	slist_iter(
	child_rsc, resource_t, clone_data->child_list, lpc,

	child_rsc->cmds->create_notify_element(
	child_rsc, op, n_data, data_set);
	);
	}

	static gint sort_rsc_id(gconstpointer a, gconstpointer b)
	{
	const resource_t resource1 = (const resource_t)a;
	const resource_t resource2 = (const resource_t)b;

	CRM_ASSERT(resource1 != NULL);
	CRM_ASSERT(resource2 != NULL);

	return strcmp(resource1->id, resource2->id);
	}

	gboolean
	clone_create_probe(resource_t rsc, node_t node, action_t *complete,
	gboolean force, pe_working_set_t *data_set)
	{
	gboolean any_created = FALSE;
	clone_variant_data_t *clone_data = NULL;
	get_clone_variant_data(clone_data, rsc);

	clone_data->child_list = g_list_sort(
	clone_data->child_list, sort_rsc_id);

	if(rsc->globally_unique == FALSE && clone_data->clone_node_max == 1) {
	/* only look for one copy */
	slist_iter(
	child_rsc, resource_t, clone_data->child_list, lpc,

	if(pe_find_node_id(child_rsc->running_on, node->details->id)) {
	return child_rsc->cmds->create_probe(
	child_rsc, node, complete, force, data_set);
	}
	);
	}
	slist_iter(
	child_rsc, resource_t, clone_data->child_list, lpc,

	if(child_rsc->cmds->create_probe(
	child_rsc, node, complete, force, data_set)) {
	any_created = TRUE;
	}

	if(any_created
	&& rsc->globally_unique == FALSE
	&& clone_data->clone_node_max == 1) {
	/* only look for one copy (clone :0) */
	break;
	}
	);

	return any_created;
	}

	void
	clone_stonith_ordering(
	resource_t rsc, action_t stonith_op, pe_working_set_t *data_set)
	{
	clone_variant_data_t *clone_data = NULL;
	get_clone_variant_data(clone_data, rsc);

	slist_iter(
	child_rsc, resource_t, clone_data->child_list, lpc,

	child_rsc->cmds->stonith_ordering(
	child_rsc, stonith_op, data_set);
	);
	}

	void
	clone_migrate_reload(resource_t rsc, pe_working_set_t data_set)
	{
	clone_variant_data_t *clone_data = NULL;
	get_clone_variant_data(clone_data, rsc);

	slist_iter(
	child_rsc, resource_t, clone_data->child_list, lpc,

	child_rsc->cmds->migrate_reload(child_rsc, data_set);
	);
	}
	diff --git a/crm/pengine/regression.sh b/crm/pengine/regression.sh
	index b6062216bb..4a717c2e1c 100755
	--- a/crm/pengine/regression.sh
	+++ b/crm/pengine/regression.sh
	@@ -1,237 +1,238 @@
	#!/bin/bash

	# Copyright (C) 2004 Andrew Beekhof <andrew@beekhof.net>
	#
	# This program is free software; you can redistribute it and/or
	# modify it under the terms of the GNU General Public
	# License as published by the Free Software Foundation; either
	# version 2.1 of the License, or (at your option) any later version.
	#
	# This software is distributed in the hope that it will be useful,
	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	# General Public License for more details.
	#
	# You should have received a copy of the GNU General Public
	# License along with this library; if not, write to the Free Software
	# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
	#

	. regression.core.sh
	create_mode="true"
	echo Generating test outputs for these tests...
	echo ""

	echo Done.
	echo ""
	echo Performing the following tests...
	create_mode="false"

	echo ""
	do_test simple1 "Offline "
	do_test simple2 "Start "
	do_test simple3 "Start 2 "
	do_test simple4 "Start Failed"
	do_test simple6 "Stop Start "
	do_test simple7 "Shutdown "
	#do_test simple8 "Stonith "
	#do_test simple9 "Lower version"
	#do_test simple10 "Higher version"
	do_test simple11 "Priority (ne)"
	do_test simple12 "Priority (eq)"
	do_test simple8 "Stickiness"

	echo ""
	do_test params-0 "Params: No change"
	do_test params-1 "Params: Changed"
	do_test params-2 "Params: Resource definition"
	do_test params-4 "Params: Reload"

	echo ""
	do_test orphan-0 "Orphan ignore"
	do_test orphan-1 "Orphan stop"

	echo ""
	do_test target-0 "Target Role : baseline"
	do_test target-1 "Target Role : test"

	echo ""
	do_test date-1 "Dates" -d "2005-020"
	do_test date-2 "Date Spec - Pass" -d "2005-020T12:30"
	do_test date-3 "Date Spec - Fail" -d "2005-020T11:30"
	do_test probe-0 "Probe (anon clone)"
	do_test probe-1 "Pending Probe"
	do_test standby "Standby"
	do_test comments "Comments"

	echo ""
	do_test rsc_dep1 "Must not "
	do_test rsc_dep3 "Must "
	do_test rsc_dep5 "Must not 3 "
	do_test rsc_dep7 "Must 3 "
	do_test rsc_dep10 "Must (but cant)"
	do_test rsc_dep2 "Must (running) "
	do_test rsc_dep8 "Must (running : alt) "
	do_test rsc_dep4 "Must (running + move)"

	echo ""
	do_test order1 "Order start 1 "
	do_test order2 "Order start 2 "
	do_test order3 "Order stop "
	do_test order4 "Order (multiple) "
	do_test order5 "Order (move) "
	do_test order6 "Order (move w/ restart) "
	do_test order7 "Order (manditory) "

	#echo ""
	#do_test agent1 "version: lt (empty)"
	#do_test agent2 "version: eq "
	#do_test agent3 "version: gt "

	echo ""
	do_test attrs1 "string: eq (and) "
	do_test attrs2 "string: lt / gt (and)"
	do_test attrs3 "string: ne (or) "
	do_test attrs4 "string: exists "
	do_test attrs5 "string: not_exists "
	do_test attrs6 "is_dc: true "
	do_test attrs7 "is_dc: false "
	do_test attrs8 "score_attribute "

	echo ""
	do_test mon-rsc-1 "Schedule Monitor - start"
	do_test mon-rsc-2 "Schedule Monitor - move "
	do_test mon-rsc-3 "Schedule Monitor - pending start "
	do_test mon-rsc-4 "Schedule Monitor - move/pending start"

	echo ""
	do_test rec-rsc-0 "Resource Recover - no start "
	do_test rec-rsc-1 "Resource Recover - start "
	do_test rec-rsc-2 "Resource Recover - monitor "
	do_test rec-rsc-3 "Resource Recover - stop - ignore"
	do_test rec-rsc-4 "Resource Recover - stop - block "
	do_test rec-rsc-5 "Resource Recover - stop - fence "
	do_test rec-rsc-6 "Resource Recover - multiple - restart"
	do_test rec-rsc-7 "Resource Recover - multiple - stop "
	do_test rec-rsc-8 "Resource Recover - multiple - block "
	do_test rec-rsc-9 "Resource Recover - group/group"

	echo ""
	do_test quorum-1 "No quorum - ignore"
	do_test quorum-2 "No quorum - freeze"
	do_test quorum-3 "No quorum - stop "
	do_test quorum-4 "No quorum - start anyway"
	do_test quorum-5 "No quorum - start anyway (group)"
	do_test quorum-6 "No quorum - start anyway (clone)"

	echo ""
	do_test rec-node-1 "Node Recover - Startup - no fence"
	do_test rec-node-2 "Node Recover - Startup - fence "
	do_test rec-node-3 "Node Recover - HA down - no fence"
	do_test rec-node-4 "Node Recover - HA down - fence "
	do_test rec-node-5 "Node Recover - CRM down - no fence"
	do_test rec-node-6 "Node Recover - CRM down - fence "
	do_test rec-node-7 "Node Recover - no quorum - ignore "
	do_test rec-node-8 "Node Recover - no quorum - freeze "
	do_test rec-node-9 "Node Recover - no quorum - stop "
	do_test rec-node-10 "Node Recover - no quorum - stop w/fence"
	do_test rec-node-11 "Node Recover - CRM down w/ group - fence "
	do_test rec-node-12 "Node Recover - nothing active - fence "
	do_test rec-node-13 "Node Recover - failed resource + shutdown - fence "
	do_test rec-node-14 "Serialize all stonith's"

	echo ""
	do_test multi1 "Multiple Active (stop/start)"

	echo ""
	do_test migrate-1 "Migrate (migrate)"
	do_test migrate-2 "Migrate (stable)"
	do_test migrate-3 "Migrate (failed migrate_to)"
	do_test migrate-4 "Migrate (failed migrate_from)"

	#echo ""
	#do_test complex1 "Complex "

	echo ""
	do_test group1 "Group "
	do_test group2 "Group + Native "
	do_test group3 "Group + Group "
	do_test group4 "Group + Native (nothing)"
	do_test group5 "Group + Native (move) "
	do_test group6 "Group + Group (move) "
	do_test group7 "Group colocation"
	do_test group13 "Group colocation (cant run)"
	do_test group8 "Group anti-colocation"
	do_test group9 "Group recovery"
	do_test group10 "Group partial recovery"
	do_test group11 "Group target_role"
	do_test group14 "Group stop (graph terminated)"

	echo ""
	do_test inc0 "Incarnation start"
	do_test inc1 "Incarnation start order"
	do_test inc2 "Incarnation silent restart, stop, move"
	do_test inc3 "Inter-incarnation ordering, silent restart, stop, move"
	do_test inc4 "Inter-incarnation ordering, silent restart, stop, move (ordered)"
	do_test inc5 "Inter-incarnation ordering, silent restart, stop, move (restart 1)"
	do_test inc6 "Inter-incarnation ordering, silent restart, stop, move (restart 2)"
	do_test inc7 "Clone colocation"
	do_test inc8 "Clone anti-colocation"
	do_test inc9 "Non-unique clone"
	do_test inc10 "Non-unique clone (stop)"
	do_test inc11 "Primitive colocation with clones"
	do_test inc12 "Clone shutdown"

	echo ""
	do_test master-0 "Stopped -> Slave"
	do_test master-1 "Stopped -> Promote"
	do_test master-2 "Stopped -> Promote : notify"
	do_test master-3 "Stopped -> Promote : master location"
	do_test master-4 "Started -> Promote : master location"
	do_test master-5 "Promoted -> Promoted"
	do_test master-6 "Promoted -> Promoted (2)"
	do_test master-7 "Promoted -> Fenced"
	do_test master-8 "Promoted -> Fenced -> Moved"
	do_test master-9 "Stopped + Promotable + No quorum"
	do_test master-10 "Stopped -> Promotable : notify with monitor"
	do_test master-11 "Stopped -> Promote : colocation"
	do_test novell-239082 "Demote/Promote ordering"
	do_test novell-239087 "Stable master placement"

	echo ""
	do_test managed-0 "Managed (reference)"
	do_test managed-1 "Not managed - down "
	do_test managed-2 "Not managed - up "

	echo ""
	do_test interleave-0 "Interleave (reference)"
	do_test interleave-1 "coloc - not interleaved"
	do_test interleave-2 "coloc - interleaved "
	do_test interleave-3 "coloc - interleaved (2)"

	echo ""
	do_test notify-0 "Notify reference"
	do_test notify-1 "Notify simple"
	do_test notify-2 "Notify simple, confirm"
	do_test notify-3 "Notify move, confirm"
	do_test novell-239079 "Notification priority"
	#do_test notify-2 "Notify - 764"

	echo ""
	do_test 594 "OSDL #594"
	do_test 662 "OSDL #662"
	do_test 696 "OSDL #696"
	do_test 726 "OSDL #726"
	do_test 735 "OSDL #735"
	do_test 764 "OSDL #764"
	do_test 797 "OSDL #797"
	do_test 829 "OSDL #829"
	do_test 994 "OSDL #994"
	do_test 1360 "OSDL #1360 - Clone stickiness"
	do_test 1484 "OSDL #1484 - on_fail=stop"
	+do_test 1494 "OSDL #1494 - Clone stability"
	do_test unrunnable-1 "Unrunnable"
	do_test stonith-0 "Stonith loop"

	echo ""

	test_results
	diff --git a/crm/pengine/testcases/1494.dot b/crm/pengine/testcases/1494.dot
	new file mode 100644
	index 0000000000..d1dac465a5
	--- /dev/null
	+++ b/crm/pengine/testcases/1494.dot
	@@ -0,0 +1,8 @@
	+ digraph "g" {
	+"ima_cloneid_stop_0" -> "ima_cloneid_stopped_0" [ style = bold]
	+"ima_cloneid_stop_0" -> "ima_rscid:0_stop_0 hb1" [ style = bold]
	+"ima_cloneid_stop_0" [ style=bold color="green" fontcolor="orange" ]
	+"ima_cloneid_stopped_0" [ style=bold color="green" fontcolor="orange" ]
	+"ima_rscid:0_stop_0 hb1" -> "ima_cloneid_stopped_0" [ style = bold]
	+"ima_rscid:0_stop_0 hb1" [ style=bold color="green" fontcolor="black" ]
	+}
	diff --git a/crm/pengine/testcases/1494.exp b/crm/pengine/testcases/1494.exp
	new file mode 100644
	index 0000000000..74d500fb53
	--- /dev/null
	+++ b/crm/pengine/testcases/1494.exp
	@@ -0,0 +1,39 @@
	+ <transition_graph cluster-delay="60s" transition_id="0">
	+ <synapse id="0">
	+ <action_set>
	+ <rsc_op id="6" operation="stop" operation_key="ima_rscid:0_stop_0" on_node="hb1" on_node_uuid="1ce670eb-d670-4f6d-811f-d415ffde76b7">
	+ <primitive id="ima_rscid:0" long-id="ima_cloneid:ima_rscid:0" class="ocf" provider="heartbeat" type="Dummy"/>
	+ <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1"/>
	+ </rsc_op>
	+ </action_set>
	+ <inputs>
	+ <trigger>
	+ <pseudo_event id="9" operation="stop" operation_key="ima_cloneid_stop_0"/>
	+ </trigger>
	+ </inputs>
	+ </synapse>
	+ <synapse id="1">
	+ <action_set>
	+ <pseudo_event id="9" operation="stop" operation_key="ima_cloneid_stop_0">
	+ <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1"/>
	+ </pseudo_event>
	+ </action_set>
	+ <inputs/>
	+ </synapse>
	+ <synapse id="2" priority="1000000">
	+ <action_set>
	+ <pseudo_event id="10" operation="stopped" operation_key="ima_cloneid_stopped_0">
	+ <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1"/>
	+ </pseudo_event>
	+ </action_set>
	+ <inputs>
	+ <trigger>
	+ <rsc_op id="6" operation="stop" operation_key="ima_rscid:0_stop_0" on_node="hb1" on_node_uuid="1ce670eb-d670-4f6d-811f-d415ffde76b7"/>
	+ </trigger>
	+ <trigger>
	+ <pseudo_event id="9" operation="stop" operation_key="ima_cloneid_stop_0"/>
	+ </trigger>
	+ </inputs>
	+ </synapse>
	+ </transition_graph>
	+
	diff --git a/crm/pengine/testcases/1494.xml b/crm/pengine/testcases/1494.xml
	new file mode 100644
	index 0000000000..0d0fad8bae
	--- /dev/null
	+++ b/crm/pengine/testcases/1494.xml
	@@ -0,0 +1,116 @@
	+<cib admin_epoch="0" have_quorum="true" num_peers="2" cib_feature_revision="1.3" ignore_dtd="false" generated="true" epoch="537" num_updates="22245" cib-last-written="Mon Feb 19 13:49:24 2007" ccm_transition="2" dc_uuid="1ce670eb-d670-4f6d-811f-d415ffde76b7">
	+ <configuration>
	+ <crm_config>
	+ <cluster_property_set id="cib-bootstrap-options">
	+ <attributes>
	+ <nvpair name="last-lrm-refresh" id="cib-bootstrap-options-last-lrm-refresh" value="1171856040"/>
	+ <nvpair id="cib-bootstrap-options-default_resource_stickiness" name="default_resource_stickiness" value="INFINITY"/>
	+ <nvpair name="stonith_enabled" id="cib-bootstrap-options-stonith_enabled" value="False"/>
	+ <nvpair id="cib-bootstrap-options-no_quorum_policy" name="no_quorum_policy" value="ignore"/>
	+ </attributes>
	+ </cluster_property_set>
	+ </crm_config>
	+ <nodes>
	+ <node id="af77f4a5-5626-43b3-acbe-9299ae520262" uname="hb3" type="normal">
	+ <instance_attributes id="nodes-af77f4a5-5626-43b3-acbe-9299ae520262">
	+ <attributes>
	+ <nvpair id="standby-af77f4a5-5626-43b3-acbe-9299ae520262" name="standby" value="off"/>
	+ </attributes>
	+ </instance_attributes>
	+ <instance_attributes id="master-af77f4a5-5626-43b3-acbe-9299ae520262">
	+ <attributes/>
	+ </instance_attributes>
	+ </node>
	+ <node uname="hb2" type="normal" id="86ad895f-1387-461e-a9b5-c52ed9537e13">
	+ <instance_attributes id="nodes-86ad895f-1387-461e-a9b5-c52ed9537e13">
	+ <attributes>
	+ <nvpair id="standby-86ad895f-1387-461e-a9b5-c52ed9537e13" name="standby" value="off"/>
	+ <nvpair id="nodes-86ad895f-1387-461e-a9b5-c52ed9537e13-inhibit_group0" name="inhibit_group0" value="1"/>
	+ </attributes>
	+ </instance_attributes>
	+ <instance_attributes id="master-86ad895f-1387-461e-a9b5-c52ed9537e13">
	+ <attributes>
	+ <nvpair id="master-resource_masterslave:0-86ad895f-1387-461e-a9b5-c52ed9537e13" name="master-resource_masterslave:0" value="1"/>
	+ </attributes>
	+ </instance_attributes>
	+ </node>
	+ <node id="1ce670eb-d670-4f6d-811f-d415ffde76b7" uname="hb1" type="normal">
	+ <instance_attributes id="nodes-1ce670eb-d670-4f6d-811f-d415ffde76b7">
	+ <attributes>
	+ <nvpair id="standby-1ce670eb-d670-4f6d-811f-d415ffde76b7" name="standby" value="off"/>
	+ <nvpair id="nodes-1ce670eb-d670-4f6d-811f-d415ffde76b7-db_in_sync" name="db_in_sync" value="1"/>
	+ </attributes>
	+ </instance_attributes>
	+ <instance_attributes id="master-1ce670eb-d670-4f6d-811f-d415ffde76b7">
	+ <attributes/>
	+ </instance_attributes>
	+ </node>
	+ </nodes>
	+ <resources>
	+ <clone id="ima_cloneid">
	+ <instance_attributes id="ima_cloneid_instance_attrs">
	+ <attributes>
	+ <nvpair id="ima_cloneid_clone_max" name="clone_max" value="2"/>
	+ <nvpair id="ima_cloneid_clone_node_max" name="clone_node_max" value="1"/>
	+ </attributes>
	+ </instance_attributes>
	+ <primitive class="ocf" type="Dummy" provider="heartbeat" id="ima_rscid">
	+ <instance_attributes id="ima_rscid_instance_attrs">
	+ <attributes>
	+ <nvpair name="target_role" id="ima_rscid_target_role" value="started"/>
	+ </attributes>
	+ </instance_attributes>
	+ </primitive>
	+ </clone>
	+ </resources>
	+ <constraints>
	+ <rsc_location id="place_ima_cloneid" rsc="ima_cloneid">
	+ <rule id="prefered_place_ima_cloneid" score="-INFINITY">
	+ <expression attribute="#uname" id="c4e38253-a1cd-4aaa-aaca-f717c3a51e1d" operation="eq" value="hb1"/>
	+ </rule>
	+ </rsc_location>
	+ </constraints>
	+ </configuration>
	+ <status>
	+ <node_state id="1ce670eb-d670-4f6d-811f-d415ffde76b7" uname="hb1" crmd="online" crm-debug-origin="do_update_resource" shutdown="0" in_ccm="true" ha="active" join="member" expected="member">
	+ <transient_attributes id="1ce670eb-d670-4f6d-811f-d415ffde76b7">
	+ <instance_attributes id="status-1ce670eb-d670-4f6d-811f-d415ffde76b7">
	+ <attributes>
	+ <nvpair id="status-1ce670eb-d670-4f6d-811f-d415ffde76b7-probe_complete" name="probe_complete" value="true"/>
	+ </attributes>
	+ </instance_attributes>
	+ </transient_attributes>
	+ <lrm id="1ce670eb-d670-4f6d-811f-d415ffde76b7">
	+ <lrm_resources>
	+ <lrm_resource id="ima_rscid:0" type="Dummy" class="ocf" provider="heartbeat">
	+ <lrm_rsc_op id="ima_rscid:0_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" transition_key="3:3:4bebe060-ef49-4030-9528-60e8e57310bd" transition_magic="4:7;3:3:4bebe060-ef49-4030-9528-60e8e57310bd" call_id="12" crm_feature_set="1.0.7" rc_code="7" op_status="4" interval="0" op_digest="08b7001b97ccdaa1ca23a9f165256bc1"/>
	+ <lrm_rsc_op id="ima_rscid:0_start_0" operation="start" crm-debug-origin="build_active_RAs" transition_key="16:5:4bebe060-ef49-4030-9528-60e8e57310bd" transition_magic="0:0;16:5:4bebe060-ef49-4030-9528-60e8e57310bd" call_id="14" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="08b7001b97ccdaa1ca23a9f165256bc1"/>
	+ </lrm_resource>
	+ <lrm_resource id="ima_rscid:1" type="Dummy" class="ocf" provider="heartbeat">
	+ <lrm_rsc_op id="ima_rscid:1_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" transition_key="12:0:4bebe060-ef49-4030-9528-60e8e57310bd" transition_magic="4:7;12:0:4bebe060-ef49-4030-9528-60e8e57310bd" call_id="11" crm_feature_set="1.0.7" rc_code="7" op_status="4" interval="0" op_digest="08b7001b97ccdaa1ca23a9f165256bc1"/>
	+ </lrm_resource>
	+ </lrm_resources>
	+ </lrm>
	+ </node_state>
	+ <node_state id="86ad895f-1387-461e-a9b5-c52ed9537e13" uname="hb2" ha="active" crm-debug-origin="do_update_resource" crmd="online" shutdown="0" in_ccm="true" join="member" expected="member">
	+ <lrm id="86ad895f-1387-461e-a9b5-c52ed9537e13">
	+ <lrm_resources>
	+ <lrm_resource id="ima_rscid:0" type="Dummy" class="ocf" provider="heartbeat">
	+ <lrm_rsc_op id="ima_rscid:0_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" transition_key="11:6:4bebe060-ef49-4030-9528-60e8e57310bd" transition_magic="0:7;11:6:4bebe060-ef49-4030-9528-60e8e57310bd" call_id="10" crm_feature_set="1.0.7" rc_code="7" op_status="0" interval="0" op_digest="08b7001b97ccdaa1ca23a9f165256bc1"/>
	+ </lrm_resource>
	+ <lrm_resource id="ima_rscid:1" type="Dummy" class="ocf" provider="heartbeat">
	+ <lrm_rsc_op id="ima_rscid:1_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" transition_key="12:6:4bebe060-ef49-4030-9528-60e8e57310bd" transition_magic="0:7;12:6:4bebe060-ef49-4030-9528-60e8e57310bd" call_id="11" crm_feature_set="1.0.7" rc_code="7" op_status="0" interval="0" op_digest="08b7001b97ccdaa1ca23a9f165256bc1"/>
	+ <lrm_rsc_op id="ima_rscid:1_start_0" operation="start" crm-debug-origin="do_update_resource" transition_key="30:6:4bebe060-ef49-4030-9528-60e8e57310bd" transition_magic="0:0;30:6:4bebe060-ef49-4030-9528-60e8e57310bd" call_id="12" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="08b7001b97ccdaa1ca23a9f165256bc1"/>
	+ </lrm_resource>
	+ </lrm_resources>
	+ </lrm>
	+ <transient_attributes id="86ad895f-1387-461e-a9b5-c52ed9537e13">
	+ <instance_attributes id="status-86ad895f-1387-461e-a9b5-c52ed9537e13">
	+ <attributes>
	+ <nvpair id="status-86ad895f-1387-461e-a9b5-c52ed9537e13-probe_complete" name="probe_complete" value="true"/>
	+ </attributes>
	+ </instance_attributes>
	+ </transient_attributes>
	+ </node_state>
	+ </status>
	+ </cib>

File Metadata

Mime Type: text/x-diff
Expires: Sat, Nov 23, 3:12 AM (40 m, 37 s)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1018093
Default Alt Text: (55 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions