diff --git a/lib/pengine/unpack.c b/lib/pengine/unpack.c
index 519979e2a4..f155c9e96a 100644
--- a/lib/pengine/unpack.c
+++ b/lib/pengine/unpack.c
@@ -1,1820 +1,1829 @@
 /* 
  * 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 <crm_internal.h>
 
 #include <lrm/lrm_api.h>
 #include <glib.h>
 
 #include <crm/crm.h>
 #include <crm/msg_xml.h>
 #include <crm/common/xml.h>
 #include <crm/common/msg.h>
 #include <crm/common/util.h>
 #include <crm/pengine/status.h>
 #include <crm/pengine/rules.h>
 #include <utils.h>
 #include <unpack.h>
 
 #define set_config_flag(data_set, option, flag) do {			\
 	const char *tmp = pe_pref(data_set->config_hash, option);	\
 	if(tmp) {							\
 	    if(crm_is_true(tmp)) {					\
 		set_bit_inplace(data_set->flags, flag);			\
 	    } else {							\
 		clear_bit_inplace(data_set->flags, flag);		\
 	    }								\
 	}								\
     } while(0)
 
 gboolean unpack_rsc_op(
     resource_t *rsc, node_t *node, xmlNode *xml_op,
     enum action_fail_response *failed, pe_working_set_t *data_set);
 
 static void pe_fence_node(pe_working_set_t *data_set, node_t *node, const char *reason)
 {
     CRM_CHECK(node, return);
     if(node->details->unclean == FALSE) {
 	if(is_set(data_set->flags, pe_flag_stonith_enabled)) {
 	    crm_warn("Node %s will be fenced %s", node->details->uname, reason);
 	} else {
 	    crm_warn("Node %s is unclean %s", node->details->uname, reason);
 	}
     }
     node->details->unclean = TRUE;
 }
 
 
 gboolean
 unpack_config(xmlNode *config, pe_working_set_t *data_set)
 {
 	const char *value = NULL;
 	GHashTable *config_hash = g_hash_table_new_full(
 		g_str_hash,g_str_equal, g_hash_destroy_str,g_hash_destroy_str);
 
 	data_set->config_hash = config_hash;
 
 	unpack_instance_attributes(
 		data_set->input, config, XML_CIB_TAG_PROPSET, NULL, config_hash,
 		CIB_OPTIONS_FIRST, FALSE, data_set->now);
 
 	verify_pe_options(data_set->config_hash);
 
 	set_config_flag(data_set, "enable-startup-probes", pe_flag_startup_probes);
 	crm_info("Startup probes: %s",
 		  is_set(data_set->flags, pe_flag_startup_probes)?"enabled":"disabled (dangerous)");
 	
 	value = pe_pref(data_set->config_hash, "stonith-timeout");
 	data_set->stonith_timeout = crm_get_msec(value);
 	crm_debug("STONITH timeout: %d", data_set->stonith_timeout);
 	
 	set_config_flag(data_set, "stonith-enabled", pe_flag_stonith_enabled);
 	crm_debug("STONITH of failed nodes is %s",
 		  is_set(data_set->flags, pe_flag_stonith_enabled)?"enabled":"disabled");	
 
 	data_set->stonith_action = pe_pref(data_set->config_hash, "stonith-action");
 	crm_debug_2("STONITH will %s nodes", data_set->stonith_action);	
 	
 	set_config_flag(data_set, "stop-all-resources", pe_flag_stop_everything);
 	crm_debug("Stop all active resources: %s",
 		  is_set(data_set->flags, pe_flag_stop_everything)?"true":"false");
 	
 	set_config_flag(data_set, "symmetric-cluster", pe_flag_symmetric_cluster);
 	if(is_set(data_set->flags, pe_flag_symmetric_cluster)) {
 		crm_debug("Cluster is symmetric"
 			 " - resources can run anywhere by default");
 	}
 	
 	value = pe_pref(data_set->config_hash, "default-resource-stickiness");
 	data_set->default_resource_stickiness = char2score(value);
 	crm_debug("Default stickiness: %d",
 		 data_set->default_resource_stickiness);
 
 	value = pe_pref(data_set->config_hash, "no-quorum-policy");
 
 	if(safe_str_eq(value, "ignore")) {
 		data_set->no_quorum_policy = no_quorum_ignore;
 		
 	} else if(safe_str_eq(value, "freeze")) {
 		data_set->no_quorum_policy = no_quorum_freeze;
 
 	} else if(safe_str_eq(value, "suicide")) {
 	    gboolean do_panic = FALSE;
 	    crm_element_value_int(data_set->input, XML_ATTR_QUORUM_PANIC, &do_panic);
 
 	    if(is_set(data_set->flags, pe_flag_stonith_enabled) == FALSE){
 		crm_config_err("Setting no-quorum-policy=suicide makes no sense if stonith-enabled=false");
 	    }
 
 	    if(do_panic && is_set(data_set->flags, pe_flag_stonith_enabled)) {
 		data_set->no_quorum_policy = no_quorum_suicide;
 
 	    } else if(is_set(data_set->flags, pe_flag_have_quorum) == FALSE && do_panic == FALSE) {
 		crm_notice("Resetting no-quorum-policy to 'stop': The cluster has never had quorum");
 		data_set->no_quorum_policy = no_quorum_stop;
 	    }
 	    
 	} else {
 		data_set->no_quorum_policy = no_quorum_stop;
 	}
 	
 	switch (data_set->no_quorum_policy) {
 		case no_quorum_freeze:
 			crm_debug("On loss of CCM Quorum: Freeze resources");
 			break;
 		case no_quorum_stop:
 			crm_debug("On loss of CCM Quorum: Stop ALL resources");
 			break;
 		case no_quorum_suicide:
 			crm_notice("On loss of CCM Quorum: Fence all remaining nodes");
 			break;
 		case no_quorum_ignore:
 			crm_notice("On loss of CCM Quorum: Ignore");
 			break;
 	}
 
 	set_config_flag(data_set, "stop-orphan-resources", pe_flag_stop_rsc_orphans);
 	crm_debug_2("Orphan resources are %s",
 		    is_set(data_set->flags, pe_flag_stop_rsc_orphans)?"stopped":"ignored");	
 	
 	set_config_flag(data_set, "stop-orphan-actions", pe_flag_stop_action_orphans);
 	crm_debug_2("Orphan resource actions are %s",
 		    is_set(data_set->flags, pe_flag_stop_action_orphans)?"stopped":"ignored");	
 
 	set_config_flag(data_set, "remove-after-stop", pe_flag_remove_after_stop);
 	crm_debug_2("Stopped resources are removed from the status section: %s",
 		    is_set(data_set->flags, pe_flag_remove_after_stop)?"true":"false");	
 	
 	set_config_flag(data_set, "maintenance-mode", pe_flag_maintenance_mode);
 	crm_debug_2("Maintenance mode: %s",
 		    is_set(data_set->flags, pe_flag_maintenance_mode)?"true":"false");	
 
 	if(is_set(data_set->flags, pe_flag_maintenance_mode)) {
 	    clear_bit(data_set->flags, pe_flag_is_managed_default);
 	} else {
 	    set_config_flag(data_set, "is-managed-default", pe_flag_is_managed_default);
 	}
 	crm_debug_2("By default resources are %smanaged",
 		    is_set(data_set->flags, pe_flag_is_managed_default)?"":"not ");
 
 	set_config_flag(data_set, "start-failure-is-fatal", pe_flag_start_failure_fatal);
 	crm_debug_2("Start failures are %s",
 		    is_set(data_set->flags, pe_flag_start_failure_fatal)?"always fatal":"handled by failcount");
 
 	node_score_red    = char2score(pe_pref(data_set->config_hash, "node-health-red"));
 	node_score_green  = char2score(pe_pref(data_set->config_hash, "node-health-green"));
 	node_score_yellow = char2score(pe_pref(data_set->config_hash, "node-health-yellow"));
 
 	crm_info("Node scores: 'red' = %s, 'yellow' = %s, 'green' = %s",
 		 pe_pref(data_set->config_hash, "node-health-red"),
 		 pe_pref(data_set->config_hash, "node-health-yellow"),
 		 pe_pref(data_set->config_hash, "node-health-green"));
 
 	data_set->placement_strategy = pe_pref(data_set->config_hash, "placement-strategy");
 	crm_debug_2("Placement strategy: %s", data_set->placement_strategy);	
 	
 	return TRUE;
 }
 
 gboolean
 unpack_nodes(xmlNode * xml_nodes, pe_working_set_t *data_set)
 {
 	node_t *new_node   = NULL;
 	const char *id     = NULL;
 	const char *uname  = NULL;
 	const char *type   = NULL;
 	const char *score  = NULL;
 	gboolean unseen_are_unclean = TRUE;
 	const char *blind_faith = pe_pref(
 		data_set->config_hash, "startup-fencing");
 	
 	if(crm_is_true(blind_faith) == FALSE) {
 		unseen_are_unclean = FALSE;
 		crm_warn("Blind faith: not fencing unseen nodes");
 	}
 
 	xml_child_iter_filter(
 		xml_nodes, xml_obj, XML_CIB_TAG_NODE,
 
 		new_node = NULL;
 
 		id     = crm_element_value(xml_obj, XML_ATTR_ID);
 		uname  = crm_element_value(xml_obj, XML_ATTR_UNAME);
 		type   = crm_element_value(xml_obj, XML_ATTR_TYPE);
 		score  = crm_element_value(xml_obj, XML_RULE_ATTR_SCORE);
 		crm_debug_3("Processing node %s/%s", uname, id);
 
 		if(id == NULL) {
 			crm_config_err("Must specify id tag in <node>");
 			continue;
 		}
 		if(type == NULL) {
 			crm_config_err("Must specify type tag in <node>");
 			continue;
 		}
 		if(pe_find_node(data_set->nodes, uname) != NULL) {
 		    crm_config_warn("Detected multiple node entries with uname=%s"
 				    " - this is rarely intended", uname);
 		}
 
 		crm_malloc0(new_node, sizeof(node_t));
 		if(new_node == NULL) {
 			return FALSE;
 		}
 		
 		new_node->weight = char2score(score);
 		new_node->fixed  = FALSE;
 		crm_malloc0(new_node->details,
 			   sizeof(struct node_shared_s));
 
 		if(new_node->details == NULL) {
 			crm_free(new_node);
 			return FALSE;
 		}
 
 		crm_debug_3("Creaing node for entry %s/%s", uname, id);
 		new_node->details->id		= id;
 		new_node->details->uname	= uname;
 		new_node->details->type		= node_ping;
 		new_node->details->online	= FALSE;
 		new_node->details->shutdown	= FALSE;
 		new_node->details->running_rsc	= NULL;
 		new_node->details->attrs        = g_hash_table_new_full(
 			g_str_hash, g_str_equal,
 			g_hash_destroy_str, g_hash_destroy_str);
 		new_node->details->utilization  = g_hash_table_new_full(
 			g_str_hash, g_str_equal,
 			g_hash_destroy_str, g_hash_destroy_str);
 		
 /* 		if(data_set->have_quorum == FALSE */
 /* 		   && data_set->no_quorum_policy == no_quorum_stop) { */
 /* 			/\* start shutting resources down *\/ */
 /* 			new_node->weight = -INFINITY; */
 /* 		} */
 		
 		if(is_set(data_set->flags, pe_flag_stonith_enabled) == FALSE || unseen_are_unclean == FALSE) {
 			/* blind faith... */
 			new_node->details->unclean = FALSE; 
 
 		} else {
 			/* all nodes are unclean until we've seen their
 			 * status entry
 			 */
 			new_node->details->unclean = TRUE;
 		}
 		
 		if(type == NULL
 		   || safe_str_eq(type, "member")
 		   || safe_str_eq(type, NORMALNODE)) {
 			new_node->details->type = node_member;
 		}
 
 		add_node_attrs(xml_obj, new_node, FALSE, data_set);
 		unpack_instance_attributes(
 			data_set->input, xml_obj, XML_TAG_UTILIZATION, NULL,
 			new_node->details->utilization, NULL, FALSE, data_set->now);
 
 		data_set->nodes = g_list_append(data_set->nodes, new_node);    
 		crm_debug_3("Done with node %s",
 			    crm_element_value(xml_obj, XML_ATTR_UNAME));
 		);
   
 	return TRUE;
 }
 
 static void g_hash_destroy_node_list(gpointer data)
 {
     GListPtr domain = data;
     slist_destroy(node_t, node, domain, crm_free(node));
 }
 
 gboolean
 unpack_domains(xmlNode *xml_domains, pe_working_set_t *data_set)
 {
     GListPtr domain = NULL;
     const char *id     = NULL;
 
     crm_info("Unpacking domains");
     data_set->domains = g_hash_table_new_full(
 	g_str_hash, g_str_equal, g_hash_destroy_str, g_hash_destroy_node_list);
     
     xml_child_iter_filter(
 	xml_domains, xml_domain, XML_CIB_TAG_DOMAIN,
 
 	domain = NULL;
 	id = crm_element_value(xml_domain, XML_ATTR_ID);
 
 	xml_child_iter_filter(
 	    xml_domain, xml_node, XML_CIB_TAG_NODE,
 	    
 	    node_t *copy = NULL;
 	    node_t *node = NULL;
 	    const char *uname = crm_element_value(xml_node, "name");
 	    const char *score = crm_element_value(xml_node, XML_RULE_ATTR_SCORE);
 
 	    if(uname == NULL) {
 		crm_config_err("Invalid domain %s: Must specify id tag in <node>", id);
 		continue;
 	    }
 
 	    node = pe_find_node(data_set->nodes, uname);
 	    if(node == NULL) {
 		node = pe_find_node_id(data_set->nodes, uname);
 		continue;
 	    }
 	    if(node == NULL) {
 		crm_config_warn("Invalid domain %s: Node %s does not exist", id, uname);
 		continue;
 	    }
 
 	    copy = node_copy(node);
 	    copy->weight = char2score(score);
 	    crm_debug("Adding %s to domain %s with score %s", node->details->uname, id, score);
 
 	    domain = g_list_append(domain, copy);
 	    );
 
 	if(domain) {
 	    crm_debug("Created domain %s with %d members", id, g_list_length(domain));
 	    g_hash_table_replace(data_set->domains, crm_strdup(id), domain);
 	}
 	);
   
 	return TRUE;
 }
 
 gboolean 
 unpack_resources(xmlNode * xml_resources, pe_working_set_t *data_set)
 {
 	xml_child_iter(
 		xml_resources, xml_obj, 
 
 		resource_t *new_rsc = NULL;
 		crm_debug_3("Beginning unpack... <%s id=%s... >",
 			    crm_element_name(xml_obj), ID(xml_obj));
 		if(common_unpack(xml_obj, &new_rsc, NULL, data_set)) {
 			data_set->resources = g_list_append(
 				data_set->resources, new_rsc);
 			
 			print_resource(LOG_DEBUG_3, "Added", new_rsc, FALSE);
 
 		} else {
 			crm_config_err("Failed unpacking %s %s",
 				      crm_element_name(xml_obj),
 				      crm_element_value(xml_obj, XML_ATTR_ID));
 			if(new_rsc != NULL && new_rsc->fns != NULL) {
 				new_rsc->fns->free(new_rsc);
 			}
 		}
 		);
 	
 	data_set->resources = g_list_sort(
 		data_set->resources, sort_rsc_priority);
 
 	if(is_set(data_set->flags, pe_flag_stonith_enabled) && is_set(data_set->flags, pe_flag_have_stonith_resource) == FALSE) {
 	    crm_config_err("Resource start-up disabled since no STONITH resources have been defined");
 	    crm_config_err("Either configure some or disable STONITH with the stonith-enabled option");
 	    crm_config_err("NOTE: Clusters with shared data need STONITH to ensure data integrity");
 	}
 	
 	return TRUE;
 }
 
 
 /* remove nodes that are down, stopping */
 /* create +ve rsc_to_node constraints between resources and the nodes they are running on */
 /* anything else? */
 gboolean
 unpack_status(xmlNode * status, pe_working_set_t *data_set)
 {
 	const char *id    = NULL;
 	const char *uname = NULL;
 
 	xmlNode * lrm_rsc    = NULL;
 	xmlNode * attrs      = NULL;
 	node_t    *this_node  = NULL;
 	
 	crm_debug_3("Beginning unpack");
 	xml_child_iter_filter(
 		status, node_state, XML_CIB_TAG_STATE,
 
 		id    = crm_element_value(node_state, XML_ATTR_ID);
 		uname = crm_element_value(node_state,    XML_ATTR_UNAME);
 		attrs = find_xml_node(
 			node_state, XML_TAG_TRANSIENT_NODEATTRS, FALSE);
 
 		lrm_rsc = find_xml_node(node_state, XML_CIB_TAG_LRM, FALSE);
 		lrm_rsc = find_xml_node(lrm_rsc, XML_LRM_TAG_RESOURCES, FALSE);
 
 		crm_debug_3("Processing node %s", uname);
 		this_node = pe_find_node_id(data_set->nodes, id);
 
 		if(uname == NULL) {
 			/* error */
 			continue;
 
 		} else if(this_node == NULL) {
 			crm_config_warn("Node %s in status section no longer exists",
 				       uname);
 			continue;
 		}
 
 		/* Mark the node as provisionally clean
 		 * - at least we have seen it in the current cluster's lifetime
 		 */
 		this_node->details->unclean = FALSE;
 		add_node_attrs(attrs, this_node, TRUE, data_set);
 
 		if(crm_is_true(g_hash_table_lookup(this_node->details->attrs, "standby"))) {
 			crm_info("Node %s is in standby-mode",
 				 this_node->details->uname);
 			this_node->details->standby = TRUE;
 		}
 		
 		crm_debug_3("determining node state");
 		determine_online_status(node_state, this_node, data_set);
 
 		if(this_node->details->online
 		   && data_set->no_quorum_policy == no_quorum_suicide) {
 		    /* Everything else should flow from this automatically
 		     * At least until the PE becomes able to migrate off healthy resources 
 		     */
 		    pe_fence_node(data_set, this_node, "because the cluster does not have quorum");
 		}
 
 		if(this_node->details->online || is_set(data_set->flags, pe_flag_stonith_enabled)) {
 			/* offline nodes run no resources...
 			 * unless stonith is enabled in which case we need to
 			 *   make sure rsc start events happen after the stonith
 			 */
 			crm_debug_3("Processing lrm resource entries");
 			unpack_lrm_resources(this_node, lrm_rsc, data_set);
 		}
 		);
 
 	return TRUE;
 	
 }
 
 static gboolean
 determine_online_status_no_fencing(pe_working_set_t *data_set, xmlNode * node_state, node_t *this_node)
 {
 	gboolean online = FALSE;
 	const char *join_state = crm_element_value(node_state, XML_CIB_ATTR_JOINSTATE);
 	const char *crm_state  = crm_element_value(node_state, XML_CIB_ATTR_CRMDSTATE);
 	const char *ccm_state  = crm_element_value(node_state, XML_CIB_ATTR_INCCM);
 	const char *ha_state   = crm_element_value(node_state, XML_CIB_ATTR_HASTATE);
 	const char *exp_state  = crm_element_value(node_state, XML_CIB_ATTR_EXPSTATE);
 
 	if(ha_state == NULL) {
 		ha_state = DEADSTATUS;
 	}
 	
 	if(!crm_is_true(ccm_state) || safe_str_eq(ha_state, DEADSTATUS)){
 		crm_debug_2("Node is down: ha_state=%s, ccm_state=%s",
 			    crm_str(ha_state), crm_str(ccm_state));
 		
 	} else if(!crm_is_true(ccm_state)
 		  || safe_str_eq(ha_state, DEADSTATUS)) {
 
 	} else if(safe_str_eq(crm_state, ONLINESTATUS)) {
 		if(safe_str_eq(join_state, CRMD_JOINSTATE_MEMBER)) {
 			online = TRUE;
 		} else {
 			crm_debug("Node is not ready to run resources: %s", join_state);
 		}
 		
 	} else if(this_node->details->expected_up == FALSE) {
 		crm_debug_2("CRMd is down: ha_state=%s, ccm_state=%s",
 			    crm_str(ha_state), crm_str(ccm_state));
 		crm_debug_2("\tcrm_state=%s, join_state=%s, expected=%s",
 			    crm_str(crm_state), crm_str(join_state),
 			    crm_str(exp_state));
 		
 	} else {
 		/* mark it unclean */
 		pe_fence_node(data_set, this_node, "because it is partially and/or un-expectedly down");
 		crm_info("\tha_state=%s, ccm_state=%s,"
 			 " crm_state=%s, join_state=%s, expected=%s",
 			 crm_str(ha_state), crm_str(ccm_state),
 			 crm_str(crm_state), crm_str(join_state),
 			 crm_str(exp_state));
 	}
 	return online;
 }
 
 static gboolean
 determine_online_status_fencing(pe_working_set_t *data_set, xmlNode * node_state, node_t *this_node)
 {
 	gboolean online = FALSE;
 	gboolean do_terminate = FALSE;
 	const char *join_state = crm_element_value(node_state, XML_CIB_ATTR_JOINSTATE);
 	const char *crm_state  = crm_element_value(node_state, XML_CIB_ATTR_CRMDSTATE);
 	const char *ccm_state  = crm_element_value(node_state, XML_CIB_ATTR_INCCM);
 	const char *ha_state   = crm_element_value(node_state, XML_CIB_ATTR_HASTATE);
 	const char *exp_state  = crm_element_value(node_state, XML_CIB_ATTR_EXPSTATE);
 	const char *terminate = g_hash_table_lookup(this_node->details->attrs, "terminate");
 
 	if(ha_state == NULL) {
 		ha_state = DEADSTATUS;
 	}
 	
 	if(crm_is_true(terminate)) {
 	    do_terminate = TRUE;
 
 	} else if(terminate != NULL && strlen(terminate) > 0) {
 	    /* could be a time() value */
 	    char t = terminate[0];
 	    if(t != '0' && isdigit(t)) {
 		do_terminate = TRUE;
 	    }
 	}
 	
 	if(crm_is_true(ccm_state)
 	   && safe_str_eq(ha_state, ACTIVESTATUS)
 	   && safe_str_eq(crm_state, ONLINESTATUS)) {
 
 	    if(safe_str_eq(join_state, CRMD_JOINSTATE_MEMBER)) {
 		online = TRUE;
 		if(do_terminate) {
 		    pe_fence_node(data_set, this_node, "because termination was requested");
 		    this_node->details->shutdown = TRUE;
 		}
 
 	    } else if(join_state == exp_state /* == NULL */) {
 		crm_info("Node %s is coming up", this_node->details->uname);
 		crm_debug("\tha_state=%s, ccm_state=%s,"
 			  " crm_state=%s, join_state=%s, expected=%s",
 			  crm_str(ha_state), crm_str(ccm_state),
 			  crm_str(crm_state), crm_str(join_state),
 			  crm_str(exp_state));
 
 	    } else if(safe_str_eq(join_state, CRMD_JOINSTATE_PENDING)) {
 		crm_info("Node %s is not ready to run resources",
 			 this_node->details->uname);
 		this_node->details->standby = TRUE;
 		this_node->details->pending = TRUE;
 		online = TRUE;
 		
 	    } else if(safe_str_eq(join_state, CRMD_JOINSTATE_NACK)) {
 		crm_warn("Node %s is not part of the cluster",
 			 this_node->details->uname);
 		this_node->details->standby = TRUE;
 		this_node->details->pending = TRUE;
 		online = TRUE;
 		
+	    } else if(safe_str_eq(join_state, exp_state)) {
+		crm_info("Node %s is still coming up: %s",
+			 this_node->details->uname, join_state);
+		crm_info("\tha_state=%s, ccm_state=%s, crm_state=%s",
+			 crm_str(ha_state), crm_str(ccm_state), crm_str(crm_state));
+		this_node->details->standby = TRUE;
+		this_node->details->pending = TRUE;
+		online = TRUE;
+		
 	    } else {
 		crm_warn("Node %s (%s) is un-expectedly down",
 			 this_node->details->uname, this_node->details->id);
 		crm_info("\tha_state=%s, ccm_state=%s,"
 			 " crm_state=%s, join_state=%s, expected=%s",
 			 crm_str(ha_state), crm_str(ccm_state),
 			 crm_str(crm_state), crm_str(join_state),
 			 crm_str(exp_state));
 		pe_fence_node(data_set, this_node, "because it is un-expectedly down");
 	    }
 		
 	} else if(crm_is_true(ccm_state) == FALSE
  		  && safe_str_eq(ha_state, DEADSTATUS)
 		  && safe_str_eq(crm_state, OFFLINESTATUS)
 		  && this_node->details->expected_up == FALSE) {
 		crm_debug("Node %s is down: join_state=%s, expected=%s",
 			  this_node->details->uname,
 			  crm_str(join_state), crm_str(exp_state));
 
 #if 0
 		/* While a nice optimization, it causes the cluster to block until the node
 		 *  comes back online.  Which is a serious problem if the cluster software
 		 *  is not configured to start at boot or stonith is configured to merely
 		 *  stop the node instead of restart it.
 		 * Easily triggered by setting terminate=true for the DC
 		 */
 	} else if(do_terminate) {
 	    crm_info("Node %s is %s after forced termination",
 		     this_node->details->uname, crm_is_true(ccm_state)?"coming up":"going down");
 	    crm_debug("\tha_state=%s, ccm_state=%s,"
 		      " crm_state=%s, join_state=%s, expected=%s",
 		      crm_str(ha_state), crm_str(ccm_state),
 		      crm_str(crm_state), crm_str(join_state),
 		      crm_str(exp_state));
 	    
 	    if(crm_is_true(ccm_state) == FALSE) {
 		this_node->details->standby = TRUE;
 		this_node->details->pending = TRUE;
 		online = TRUE;
 	    }
 #endif
 	    
 	} else if(this_node->details->expected_up) {
 		/* mark it unclean */
 		pe_fence_node(data_set, this_node, "because it is un-expectedly down");
 		crm_info("\tha_state=%s, ccm_state=%s,"
 			 " crm_state=%s, join_state=%s, expected=%s",
 			 crm_str(ha_state), crm_str(ccm_state),
 			 crm_str(crm_state), crm_str(join_state),
 			 crm_str(exp_state));
 
 	} else {
 		crm_info("Node %s is down", this_node->details->uname);
 		crm_debug("\tha_state=%s, ccm_state=%s,"
 			  " crm_state=%s, join_state=%s, expected=%s",
 			  crm_str(ha_state), crm_str(ccm_state),
 			  crm_str(crm_state), crm_str(join_state),
 			  crm_str(exp_state));
 	}
 	return online;
 }
 
 gboolean
 determine_online_status(
 	xmlNode * node_state, node_t *this_node, pe_working_set_t *data_set)
 {
 	gboolean online = FALSE;
 	const char *shutdown = NULL;
 	const char *exp_state = crm_element_value(node_state, XML_CIB_ATTR_EXPSTATE);
 	
 	if(this_node == NULL) {
 		crm_config_err("No node to check");
 		return online;
 	}
 
 	this_node->details->shutdown = FALSE;
 	this_node->details->expected_up = FALSE;
 	shutdown = g_hash_table_lookup(this_node->details->attrs, XML_CIB_ATTR_SHUTDOWN);
 
 	if(shutdown != NULL && safe_str_neq("0", shutdown)) {
 	    this_node->details->shutdown = TRUE;
 
 	} else if(safe_str_eq(exp_state, CRMD_JOINSTATE_MEMBER)) {
 	    this_node->details->expected_up = TRUE;
 	}
 	
 	if(is_set(data_set->flags, pe_flag_stonith_enabled) == FALSE) {
 		online = determine_online_status_no_fencing(
 		    data_set, node_state, this_node);
 		
 	} else {
 		online = determine_online_status_fencing(
 		    data_set, node_state, this_node);
 	}
 	
 	if(online) {
 		this_node->details->online = TRUE;
 
 	} else {
 		/* remove node from contention */
 		this_node->fixed = TRUE;
 		this_node->weight = -INFINITY;
 	}
 
 	if(online && this_node->details->shutdown) {
 		/* dont run resources here */
 		this_node->fixed = TRUE;
 		this_node->weight = -INFINITY;
 	}	
 
 	if(this_node->details->unclean) {
 		pe_proc_warn("Node %s is unclean", this_node->details->uname);
 
 	} else if(this_node->details->online) {
 	    crm_info("Node %s is %s", this_node->details->uname,
 		     this_node->details->shutdown?"shutting down":
 		     this_node->details->pending?"pending":
 		     this_node->details->standby?"standby":"online");
 	    
 	} else {
 		crm_debug_2("Node %s is offline", this_node->details->uname);
 	}
 
 	return online;
 }
 
 #define set_char(x) last_rsc_id[lpc] = x; complete = TRUE;
 
 char *
 clone_zero(const char *last_rsc_id)
 {
     int lpc = 0;
     char *zero = NULL;
 
     CRM_CHECK(last_rsc_id != NULL, return NULL);
     if(last_rsc_id != NULL) {
 	lpc = strlen(last_rsc_id);
     }
     
     while(--lpc > 0) {
 	switch(last_rsc_id[lpc]) {
 	    case 0:
 		return NULL;
 		break;
 	    case '0':
 	    case '1':
 	    case '2':
 	    case '3':
 	    case '4':
 	    case '5':
 	    case '6':
 	    case '7':
 	    case '8':
 	    case '9':
 		break;
 	    case ':':
 		crm_malloc0(zero, lpc + 3);
 		memcpy(zero, last_rsc_id, lpc);		
 		zero[lpc] = ':';
 		zero[lpc+1] = '0';
 		zero[lpc+2] = 0;
 		return zero;
 	}
     }
     return NULL;
 }
 
 char *
 increment_clone(char *last_rsc_id)
 {
 	int lpc = 0;
 	int len = 0;
 	char *tmp = NULL;
 	gboolean complete = FALSE;
 
 	CRM_CHECK(last_rsc_id != NULL, return NULL);
 	if(last_rsc_id != NULL) {
 		len = strlen(last_rsc_id);
 	}
 	
 	lpc = len-1;
 	while(complete == FALSE && lpc > 0) {
 		switch (last_rsc_id[lpc]) {
 			case 0:
 				lpc--;
 				break;
 			case '0':
 				set_char('1');
 				break;
 			case '1':
 				set_char('2');
 				break;
 			case '2':
 				set_char('3');
 				break;
 			case '3':
 				set_char('4');
 				break;
 			case '4':
 				set_char('5');
 				break;
 			case '5':
 				set_char('6');
 				break;
 			case '6':
 				set_char('7');
 				break;
 			case '7':
 				set_char('8');
 				break;
 			case '8':
 				set_char('9');
 				break;
 			case '9':
 				last_rsc_id[lpc] = '0';
 				lpc--;
 				break;
 			case ':':
 				tmp = last_rsc_id;
 				crm_malloc0(last_rsc_id, len + 2);
 				memcpy(last_rsc_id, tmp, len);
 				last_rsc_id[++lpc] = '1';
 				last_rsc_id[len] = '0';
 				last_rsc_id[len+1] = 0;
 				complete = TRUE;
 				crm_free(tmp);
 				break;
 			default:
 				crm_err("Unexpected char: %c (%d)",
 					last_rsc_id[lpc], lpc);
 				break;
 		}
 	}
 	return last_rsc_id;
 }
 
 static resource_t *
 create_fake_resource(const char *rsc_id, xmlNode *rsc_entry, pe_working_set_t *data_set) 
 {
 	resource_t *rsc = NULL;
 	xmlNode *xml_rsc  = create_xml_node(NULL, XML_CIB_TAG_RESOURCE);
 	copy_in_properties(xml_rsc, rsc_entry);
 	crm_xml_add(xml_rsc, XML_ATTR_ID, rsc_id);
 	crm_log_xml_debug(xml_rsc, "Orphan resource");
 	
 	common_unpack(xml_rsc, &rsc, NULL, data_set);
 	set_bit(rsc->flags, pe_rsc_orphan);
 	
 	data_set->resources = g_list_append(data_set->resources, rsc);
 	return rsc;
 }
 
 extern resource_t *create_child_clone(resource_t *rsc, int sub_id, pe_working_set_t *data_set);
 
 static resource_t *find_clone(pe_working_set_t *data_set, node_t *node, resource_t *parent, const char *rsc_id) 
 {
     int len = 0;
     resource_t *rsc = NULL;
     char *base = clone_zero(rsc_id);
     char *alt_rsc_id = crm_strdup(rsc_id);
 
     CRM_ASSERT(parent != NULL);
     CRM_ASSERT(parent->variant == pe_clone || parent->variant == pe_master);
 
     if(base) {
 	len = strlen(base);
     }
     if(len > 0) {
 	base[len-1] = 0;
     }
     
     crm_debug_3("Looking for %s on %s in %s %d",
 		rsc_id, node->details->uname, parent->id, is_set(parent->flags, pe_rsc_unique));
     
     if(is_set(parent->flags, pe_rsc_unique)) {
 	crm_debug_3("Looking for %s", rsc_id);
 	rsc = parent->fns->find_rsc(parent, rsc_id, FALSE, FALSE, NULL, TRUE);
 
     } else {
 	rsc = parent->fns->find_rsc(parent, base, FALSE, TRUE, node, TRUE);
 	if(rsc != NULL && rsc->running_on) {
 	    rsc = NULL;
 	    crm_debug_3("Looking for an existing orphan for %s: %s on %s", parent->id, rsc_id, node->details->uname);
 
 	    /* There is already an instance of this _anonymous_ clone active on "node".
 	     *
 	     * If there is a partially active orphan (only applies to clone groups) on
 	     * the same node, use that.
 	     * Otherwise create a new (orphaned) instance at "orphan_check:".
 	    */
 	    slist_iter(child, resource_t, parent->children, lpc,
 		       node_t *loc = child->fns->location(child, NULL, TRUE);
 		       if(loc && loc->details == node->details) {
 			   resource_t *tmp = child->fns->find_rsc(child, base, FALSE, TRUE, NULL, TRUE);
 			   if(tmp && tmp->running_on == NULL) {
 			       rsc = tmp;
 			       break;
 			   }
 		       }
 		);
 	    
 	    goto orphan_check;
 	}
 	
 	while(rsc == NULL) {
 	    crm_debug_3("Trying %s", alt_rsc_id);
 	    rsc = parent->fns->find_rsc(parent, alt_rsc_id, FALSE, FALSE, NULL, TRUE);
 	    if(rsc == NULL) {
 		break;
 
 	    } else if(rsc->running_on == NULL) {
 		break;
 	    }
 	    alt_rsc_id = increment_clone(alt_rsc_id);
 	    rsc = NULL;
 	}
     }
 
   orphan_check:
     if(rsc == NULL) {
 	/* Create an extra orphan */
 	resource_t *top = create_child_clone(parent, -1, data_set);
 	crm_debug("Created orphan for %s: %s on %s", parent->id, rsc_id, node->details->uname);
 	rsc = top->fns->find_rsc(top, base, FALSE, TRUE, NULL, TRUE);
 	CRM_ASSERT(rsc != NULL);
     }
 
     crm_free(rsc->clone_name); rsc->clone_name = NULL;
     if(safe_str_neq(rsc_id, rsc->id)) {
 	crm_info("Internally renamed %s on %s to %s%s",
 		 rsc_id, node->details->uname, rsc->id,
 		 is_set(rsc->flags, pe_rsc_orphan)?" (ORPHAN)":"");
 	rsc->clone_name = crm_strdup(rsc_id);
     }
     
     crm_free(alt_rsc_id);
     crm_free(base);
     return rsc;
 }
 
 static resource_t *
 unpack_find_resource(
 	pe_working_set_t *data_set, node_t *node, const char *rsc_id, xmlNode *rsc_entry)
 {
 	resource_t *rsc = NULL;
 	resource_t *clone_parent = NULL;
 	char *alt_rsc_id = crm_strdup(rsc_id);
 	
 	crm_debug_2("looking for %s", rsc_id);
 		
 	rsc = pe_find_resource(data_set->resources, alt_rsc_id);
 	/* no match */
 	if(rsc == NULL) {
 	    /* Even when clone-max=0, we still create a single :0 orphan to match against */
 	    char *tmp = clone_zero(alt_rsc_id);
 	    resource_t *clone0 = pe_find_resource(data_set->resources, tmp);
 	    clone_parent = uber_parent(clone0);
 	    crm_free(tmp);
 	    
 	    crm_debug_2("%s not found: %s", alt_rsc_id, clone_parent?clone_parent->id:"orphan");
 
 	} else {
 	    clone_parent = uber_parent(rsc);
 	}
 
 	if(clone_parent && clone_parent->variant > pe_group) {
 	    rsc = find_clone(data_set, node, clone_parent, rsc_id);
 	    CRM_ASSERT(rsc != NULL);
 	}
 	
 	crm_free(alt_rsc_id);
 	return rsc;
 }
 
 static resource_t *
 process_orphan_resource(xmlNode *rsc_entry, node_t *node, pe_working_set_t *data_set) 
 {
 	resource_t *rsc = NULL;
 	const char *rsc_id   = crm_element_value(rsc_entry, XML_ATTR_ID);
 	
 	crm_debug("Detected orphan resource %s on %s", rsc_id, node->details->uname);	
 	rsc = create_fake_resource(rsc_id, rsc_entry, data_set);
 	
 	if(is_set(data_set->flags, pe_flag_stop_rsc_orphans) == FALSE) {
 	    clear_bit(rsc->flags, pe_rsc_managed);
 		
 	} else {
 		print_resource(LOG_DEBUG_3, "Added orphan", rsc, FALSE);
 			
 		CRM_CHECK(rsc != NULL, return NULL);
 		resource_location(rsc, NULL, -INFINITY, "__orphan_dont_run__", data_set);
 	}
 	return rsc;
 }
 
 static void
 process_rsc_state(resource_t *rsc, node_t *node,
 		  enum action_fail_response on_fail,
 		  xmlNode *migrate_op,
 		  pe_working_set_t *data_set) 
 {
 	if(on_fail == action_migrate_failure) {
 	    node_t *from = NULL;
 	    const char *uuid = crm_element_value(migrate_op, CRMD_ACTION_MIGRATED);
 	    
 	    on_fail = action_fail_recover;
 	    
 	    from = pe_find_node_id(data_set->nodes, uuid);
 	    if(from != NULL) {
 		process_rsc_state(rsc, from, on_fail, NULL, data_set);
 	    } else {
 		crm_log_xml_err(migrate_op, "Bad Op");
 	    }
 	}
 	
 	crm_debug_2("Resource %s is %s on %s: on_fail=%s",
 		    rsc->id, role2text(rsc->role),
 		node->details->uname, fail2text(on_fail));
 
 	/* process current state */
 	if(rsc->role != RSC_ROLE_UNKNOWN) { 
 		rsc->known_on = g_list_append(rsc->known_on, node);
 	}
 
 	if(node->details->unclean) {
 	    /* No extra processing needed
 	     * Also allows resources to be started again after a node is shot
 	     */
 	    on_fail = action_fail_ignore;
 	}
 	
 	switch(on_fail) {
 	    case action_fail_ignore:
 		/* nothing to do */
 		break;
 		
 	    case action_fail_fence:
 		/* treat it as if it is still running
 		 * but also mark the node as unclean
 		 */
 		pe_fence_node(data_set, node, "to recover from resource failure(s)");
 		break;
 		
 	    case action_fail_standby:
 		node->details->standby = TRUE;
 		node->details->standby_onfail = TRUE;
 		break;
 		    
 	    case action_fail_block:
 		/* is_managed == FALSE will prevent any
 		 * actions being sent for the resource
 		 */
 		clear_bit(rsc->flags, pe_rsc_managed);
 		break;
 		
 	    case action_fail_migrate:
 		/* make sure it comes up somewhere else
 		 * or not at all
 		 */
 		resource_location(rsc, node, -INFINITY,
 				  "__action_migration_auto__",data_set);
 		break;
 		
 	    case action_fail_stop:		
 		rsc->next_role = RSC_ROLE_STOPPED;
 		break;
 		
 	    case action_fail_recover:
 		if(rsc->role != RSC_ROLE_STOPPED && rsc->role != RSC_ROLE_UNKNOWN) { 
 		    set_bit(rsc->flags, pe_rsc_failed);
 		    stop_action(rsc, node, FALSE);
 		}
 		break;
 		
 	    case action_migrate_failure:
 		/* anything extra? */
 		break;
 	}
 	
 	if(rsc->role != RSC_ROLE_STOPPED && rsc->role != RSC_ROLE_UNKNOWN) {
 		if(is_set(rsc->flags, pe_rsc_orphan)) {
 		    if(is_set(rsc->flags, pe_rsc_managed)) {
 			crm_config_warn("Detected active orphan %s running on %s",
 					rsc->id, node->details->uname);
 		    } else {
 			crm_config_warn("Cluster configured not to stop active orphans."
 					" %s must be stopped manually on %s",
 					rsc->id, node->details->uname);
 		    }
 		}
 	    
 		native_add_running(rsc, node, data_set);
 		if(on_fail != action_fail_ignore) {
 		    set_bit(rsc->flags, pe_rsc_failed);
 		}
 			
 	} else if(rsc->clone_name) {
 		crm_debug_2("Resetting clone_name %s for %s (stopped)",
 			    rsc->clone_name, rsc->id);
 		crm_free(rsc->clone_name);
 		rsc->clone_name = NULL;
 
 	} else {
 		char *key = stop_key(rsc);
 		GListPtr possible_matches = find_actions(rsc->actions, key, node);
 		slist_iter(stop, action_t, possible_matches, lpc,
 			   stop->optional = TRUE;
 			);
 		crm_free(key);
 	}
 }
 
 /* create active recurring operations as optional */ 
 static void
 process_recurring(node_t *node, resource_t *rsc,
 		  int start_index, int stop_index,
 		  GListPtr sorted_op_list, pe_working_set_t *data_set)
 {
 	const char *task = NULL;
 	const char *status = NULL;
 	
 	crm_debug_3("%s: Start index %d, stop index = %d",
 		    rsc->id, start_index, stop_index);
 	slist_iter(rsc_op, xmlNode, sorted_op_list, lpc,
 		   int interval = 0;
 		   char *key = NULL;
 		   const char *id = ID(rsc_op);
 		   const char *interval_s = NULL;
 		   if(node->details->online == FALSE) {
 			   crm_debug_4("Skipping %s/%s: node is offline",
 				       rsc->id, node->details->uname);
 			   break;
 			   
 		   } else if(start_index < stop_index) {
 			   crm_debug_4("Skipping %s/%s: not active",
 				       rsc->id, node->details->uname);
 			   break;
 			   
 		   } else if(lpc <= start_index) {
 			   crm_debug_4("Skipping %s/%s: old",
 				       id, node->details->uname);
 			   continue;
 		   }
 		   	
 		   interval_s = crm_element_value(rsc_op,XML_LRM_ATTR_INTERVAL);
 		   interval = crm_parse_int(interval_s, "0");
 		   if(interval == 0) {
 			   crm_debug_4("Skipping %s/%s: non-recurring",
 				       id, node->details->uname);
 			   continue;
 		   }
 		   
 		   status = crm_element_value(rsc_op, XML_LRM_ATTR_OPSTATUS);
 		   if(safe_str_eq(status, "-1")) {
 			   crm_debug_4("Skipping %s/%s: status",
 				       id, node->details->uname);
 			   continue;
 		   }
 		   task = crm_element_value(rsc_op, XML_LRM_ATTR_TASK);
 		   /* create the action */
 		   key = generate_op_key(rsc->id, task, interval);
 		   crm_debug_3("Creating %s/%s", key, node->details->uname);
 		   custom_action(rsc, key, task, node, TRUE, TRUE, data_set);
 		);
 }
 
 void
 calculate_active_ops(GListPtr sorted_op_list, int *start_index, int *stop_index) 
 {
 	const char *task = NULL;
 	const char *status = NULL;
 
 	*stop_index = -1;
 	*start_index = -1;
 	
 	slist_iter(
 		rsc_op, xmlNode, sorted_op_list, lpc,
 
 		task = crm_element_value(rsc_op, XML_LRM_ATTR_TASK);
 		status = crm_element_value(rsc_op, XML_LRM_ATTR_OPSTATUS);
 
 		if(safe_str_eq(task, CRMD_ACTION_STOP)
 		   && safe_str_eq(status, "0")) {
 			*stop_index = lpc;
 			
 		} else if(safe_str_eq(task, CRMD_ACTION_START)) {
 			*start_index = lpc;
 			
 		} else if(*start_index <= *stop_index
 			  && safe_str_eq(task, CRMD_ACTION_STATUS)) {
 			const char *rc = crm_element_value(rsc_op, XML_LRM_ATTR_RC);
 			if(safe_str_eq(rc, "0") || safe_str_eq(rc, "8")) {
 				*start_index = lpc;
 			}
 		}
 		);
 }
 
 	
 static void
 unpack_lrm_rsc_state(
 	node_t *node, xmlNode * rsc_entry, pe_working_set_t *data_set)
 {	
 	int stop_index = -1;
 	int start_index = -1;
 	enum rsc_role_e req_role = RSC_ROLE_UNKNOWN;
 
 	const char *task = NULL;
 	const char *rsc_id  = crm_element_value(rsc_entry, XML_ATTR_ID);
 
 	resource_t *rsc = NULL;
 	GListPtr op_list = NULL;
 	GListPtr sorted_op_list = NULL;
 
 	xmlNode *migrate_op = NULL;
 	
 	enum action_fail_response on_fail = FALSE;
 	enum rsc_role_e saved_role = RSC_ROLE_UNKNOWN;
 	
 	crm_debug_3("[%s] Processing %s on %s",
 		    crm_element_name(rsc_entry), rsc_id, node->details->uname);
 
 	/* extract operations */
 	op_list = NULL;
 	sorted_op_list = NULL;
 		
 	xml_child_iter_filter(
 		rsc_entry, rsc_op, XML_LRM_TAG_RSC_OP,
 		op_list = g_list_append(op_list, rsc_op);
 		);
 
 	if(op_list == NULL) {
 		/* if there are no operations, there is nothing to do */
 		return;
 	}
 
 	/* find the resource */
 	rsc = unpack_find_resource(data_set, node, rsc_id, rsc_entry);
 	if(rsc == NULL) {
 		rsc = process_orphan_resource(rsc_entry, node, data_set);
 	} 
 	CRM_ASSERT(rsc != NULL);
 	
 	/* process operations */
 	saved_role = rsc->role;
 	on_fail = action_fail_ignore;
 	rsc->role = RSC_ROLE_UNKNOWN;
 	sorted_op_list = g_list_sort(op_list, sort_op_by_callid);
 	
 	slist_iter(
 		rsc_op, xmlNode, sorted_op_list, lpc,
 
 		task = crm_element_value(rsc_op, XML_LRM_ATTR_TASK);
 		if(safe_str_eq(task, CRMD_ACTION_MIGRATED)) {
 			migrate_op = rsc_op;
 		}
 		
 		unpack_rsc_op(rsc, node, rsc_op, &on_fail, data_set);
 		);
 
 	/* create active recurring operations as optional */ 
 	calculate_active_ops(sorted_op_list, &start_index, &stop_index);
 	process_recurring(node, rsc, start_index, stop_index,
 			  sorted_op_list, data_set);
 	
 	/* no need to free the contents */
 	g_list_free(sorted_op_list);
 	
 	process_rsc_state(rsc, node, on_fail, migrate_op, data_set);
 
 	if(get_target_role(rsc, &req_role)) {
 	    if(rsc->next_role == RSC_ROLE_UNKNOWN || req_role < rsc->next_role) {
 		crm_debug("%s: Overwriting calculated next role %s"
 			  " with requested next role %s",
 			  rsc->id, role2text(rsc->next_role),
 			  role2text(req_role));
 		rsc->next_role = req_role;
 
 	    } else if(req_role > rsc->next_role) {
 		crm_info("%s: Not overwriting calculated next role %s"
 			 " with requested next role %s",
 			 rsc->id, role2text(rsc->next_role),
 			 role2text(req_role));
 	    }
 	}
 		
 	if(saved_role > rsc->role) {
 		rsc->role = saved_role;
 	}
 }
 
 gboolean
 unpack_lrm_resources(node_t *node, xmlNode * lrm_rsc_list, pe_working_set_t *data_set)
 {
 	CRM_CHECK(node != NULL, return FALSE);
 
 	crm_debug_3("Unpacking resources on %s", node->details->uname);
 
 	xml_child_iter_filter(
 		lrm_rsc_list, rsc_entry, XML_LRM_TAG_RESOURCE,
 		unpack_lrm_rsc_state(node, rsc_entry, data_set);
 		);
 	
 	return TRUE;
 }
 
 static void set_active(resource_t *rsc) 
 {
     resource_t *top = uber_parent(rsc);
     if(top && top->variant == pe_master) {
 	rsc->role = RSC_ROLE_SLAVE;
     } else {
 	rsc->role = RSC_ROLE_STARTED;
     }
 }
 
 gboolean
 unpack_rsc_op(resource_t *rsc, node_t *node, xmlNode *xml_op,
 	      enum action_fail_response *on_fail, pe_working_set_t *data_set) 
 {    
 	const char *id          = NULL;
 	const char *key        = NULL;
 	const char *task        = NULL;
 	const char *magic       = NULL;
  	const char *task_id     = NULL;
  	const char *actual_rc   = NULL;
 /* 	const char *target_rc   = NULL;	 */
 	const char *task_status = NULL;
 	const char *interval_s  = NULL;
 	const char *op_digest   = NULL;
 	const char *op_version  = NULL;
 
 	int interval = 0;
 	int task_status_i = -2;
 	int actual_rc_i = 0;
 	int target_rc = -1;
 	
 	action_t *action = NULL;
 	node_t *effective_node = NULL;
 	resource_t *failed = NULL;
 
 	gboolean expired = FALSE;
 	gboolean is_probe = FALSE;
 	
 	CRM_CHECK(rsc    != NULL, return FALSE);
 	CRM_CHECK(node   != NULL, return FALSE);
 	CRM_CHECK(xml_op != NULL, return FALSE);
 
 	id	    = ID(xml_op);
 	task        = crm_element_value(xml_op, XML_LRM_ATTR_TASK);
  	task_id     = crm_element_value(xml_op, XML_LRM_ATTR_CALLID);
 	task_status = crm_element_value(xml_op, XML_LRM_ATTR_OPSTATUS);
 	op_digest   = crm_element_value(xml_op, XML_LRM_ATTR_OP_DIGEST);
 	op_version  = crm_element_value(xml_op, XML_ATTR_CRM_VERSION);
 	magic	    = crm_element_value(xml_op, XML_ATTR_TRANSITION_MAGIC);
 	key	    = crm_element_value(xml_op, XML_ATTR_TRANSITION_KEY);
 
 	CRM_CHECK(id != NULL, return FALSE);
 	CRM_CHECK(task != NULL, return FALSE);
 	CRM_CHECK(task_status != NULL, return FALSE);
 
 	task_status_i = crm_parse_int(task_status, NULL);
 
 	CRM_CHECK(task_status_i <= LRM_OP_ERROR, return FALSE);
 	CRM_CHECK(task_status_i >= LRM_OP_PENDING, return FALSE);
 
 	if(safe_str_eq(task, CRMD_ACTION_NOTIFY)) {
 		/* safe to ignore these */
 		return TRUE;
 	}
 
 	if(rsc->failure_timeout > 0) {
 	    int last_run = 0;
 
 	    if(crm_element_value_int(xml_op, "last-run", &last_run) == 0) {
 /* int last_change = crm_element_value_int(xml_op, "last_rc_change"); */
 		time_t now = get_timet_now(data_set);
 		if(now > (last_run + rsc->failure_timeout)) {
 		    expired = TRUE;
 		}
 	    }
 	}
 	
 	crm_debug_2("Unpacking task %s/%s (call_id=%s, status=%s) on %s (role=%s)",
 		    id, task, task_id, task_status, node->details->uname,
 		    role2text(rsc->role));
 
 	interval_s = crm_element_value(xml_op, XML_LRM_ATTR_INTERVAL);
 	interval = crm_parse_int(interval_s, "0");
 	
 	if(interval == 0 && safe_str_eq(task, CRMD_ACTION_STATUS)) {
 		is_probe = TRUE;
 	}
 	
 	if(node->details->unclean) {
 		crm_debug_2("Node %s (where %s is running) is unclean."
 			  " Further action depends on the value of the stop's on-fail attribue",
 			  node->details->uname, rsc->id);
 	}
 
 	actual_rc = crm_element_value(xml_op, XML_LRM_ATTR_RC);
 	CRM_CHECK(actual_rc != NULL, return FALSE);	
 	actual_rc_i = crm_parse_int(actual_rc, NULL);
 
 	if(key) {
 	    int dummy = 0;
 	    char *dummy_string = NULL;
 	    decode_transition_key(key, &dummy_string, &dummy, &dummy, &target_rc);
 	    crm_free(dummy_string);
 	}
 	
 	if(task_status_i == LRM_OP_DONE && target_rc >= 0) {
 	    if(target_rc == actual_rc_i) {
 		task_status_i = LRM_OP_DONE;
 		
 	    } else {
 		task_status_i = LRM_OP_ERROR;
 		crm_debug("%s on %s returned %d (%s) instead of the expected value: %d (%s)",
 			 id, node->details->uname,
 			 actual_rc_i, execra_code2string(actual_rc_i),
 			 target_rc, execra_code2string(target_rc));
 	    }
 
 	} else if(task_status_i == LRM_OP_ERROR) {
 	    /* let us decide that */
  	    task_status_i = LRM_OP_DONE;
 	}
 	
 	if(task_status_i == LRM_OP_NOTSUPPORTED) {
 	    actual_rc_i = EXECRA_UNIMPLEMENT_FEATURE;
 	}
 
 	if(task_status_i != actual_rc_i
 	   && rsc->failure_timeout > 0
 	   && get_failcount(node, rsc, NULL, data_set) == 0) {
 	    action_t *clear_op = NULL;
 	    clear_op = custom_action(
 		rsc, crm_concat(rsc->id, CRM_OP_CLEAR_FAILCOUNT, '_'),
 		CRM_OP_CLEAR_FAILCOUNT, node, FALSE, TRUE, data_set);
 	    
 	    add_hash_param(clear_op->meta, XML_ATTR_TE_NOWAIT, XML_BOOLEAN_TRUE);	    
 	    crm_notice("Clearing expired failcount for %s on %s", rsc->id, node->details->uname);
 	}
 	
 	if(expired
 	   && actual_rc_i != EXECRA_NOT_RUNNING
 	   && actual_rc_i != EXECRA_RUNNING_MASTER
 	   && actual_rc_i != EXECRA_OK) {
 	    crm_notice("Ignoring expired failure %s (rc=%d, magic=%s) on %s",
 		       id, actual_rc_i, magic, node->details->uname);
 	    goto done;
 	}	
 
 	/* we could clean this up significantly except for old LRMs and CRMs that
 	 * didnt include target_rc and liked to remap status
 	 */
 	switch(actual_rc_i) {
 	    case EXECRA_NOT_RUNNING:
 		if(is_probe || target_rc == actual_rc_i) {
 		    task_status_i = LRM_OP_DONE;
 		    rsc->role = RSC_ROLE_STOPPED;
 		    
 		    /* clear any previous failure actions */
 		    *on_fail = action_fail_ignore;
 		    rsc->next_role = RSC_ROLE_UNKNOWN;
 		    
 		} else if(safe_str_neq(task, CRMD_ACTION_STOP)) {
 		    task_status_i = LRM_OP_ERROR;
 		}
 		break;
 		
 	    case EXECRA_RUNNING_MASTER:
 		if(is_probe) {
 		    task_status_i = LRM_OP_DONE;
 		    crm_notice("Operation %s found resource %s active in master mode on %s",
 			     id, rsc->id, node->details->uname);
 
 		} else if(target_rc == actual_rc_i) {
 		    /* nothing to do */
 
 		} else if(target_rc >= 0) {
 		    task_status_i = LRM_OP_ERROR;
 
 		    /* legacy code for pre-0.6.5 operations */
 		} else if(safe_str_neq(task, CRMD_ACTION_STATUS)
 			  || rsc->role != RSC_ROLE_MASTER) {
 		    task_status_i = LRM_OP_ERROR;
 		    if(rsc->role != RSC_ROLE_MASTER) {
 			crm_err("%s reported %s in master mode on %s",
 				id, rsc->id,
 				node->details->uname);
 		    }
 		}
 		rsc->role = RSC_ROLE_MASTER;
 		break;
 		
 	    case EXECRA_FAILED_MASTER:
 		rsc->role = RSC_ROLE_MASTER;
 		task_status_i = LRM_OP_ERROR;
 		break;
 
 	    case EXECRA_UNIMPLEMENT_FEATURE:
 		if(interval > 0) {
 		    task_status_i = LRM_OP_NOTSUPPORTED;
 		    break;
 		}
 		/* else: fall through */
 	    case EXECRA_INSUFFICIENT_PRIV:
 	    case EXECRA_NOT_INSTALLED:
 	    case EXECRA_INVALID_PARAM:
 		effective_node = node;
 		/* fall through */
 	    case EXECRA_NOT_CONFIGURED:
 		failed = rsc;
 		if(is_not_set(rsc->flags, pe_rsc_unique)) {
 		    failed = uber_parent(failed);
 		}
 		
 		do_crm_log(actual_rc_i==EXECRA_NOT_INSTALLED?LOG_NOTICE:LOG_ERR,
 			   "Hard error - %s failed with rc=%d: Preventing %s from re-starting %s %s",
 			id, actual_rc_i, failed->id,
 			effective_node?"on":"anywhere",
 			effective_node?effective_node->details->uname:"in the cluster");
 
 		resource_location(failed, effective_node, -INFINITY, "hard-error", data_set);
 		if(is_probe) {
 			/* treat these like stops */
 			task = CRMD_ACTION_STOP;
 			task_status_i = LRM_OP_DONE;
 			crm_xml_add(xml_op, XML_ATTR_UNAME, node->details->uname);
 			if(actual_rc_i != EXECRA_NOT_INSTALLED
 			   || is_set(data_set->flags, pe_flag_symmetric_cluster)) {
 			    add_node_copy(data_set->failed, xml_op);
 			}
 		}
 		break;
 
 	    case EXECRA_OK:
 		if(is_probe && target_rc == 7) {
 		    task_status_i = LRM_OP_DONE;
 		    crm_notice("Operation %s found resource %s active on %s",
 			     id, rsc->id, node->details->uname);
 
 		    /* legacy code for pre-0.6.5 operations */
 		} else if(target_rc < 0
 		   && interval > 0
 		   && rsc->role == RSC_ROLE_MASTER) {
 		    /* catch status ops that return 0 instead of 8 while they
 		     *   are supposed to be in master mode
 		     */
 		    task_status_i = LRM_OP_ERROR;
 		}
 		
 		break;
 		
 	    default:
 		if(task_status_i == LRM_OP_DONE) {
 		    crm_info("Remapping %s (rc=%d) on %s to an ERROR",
 			     id, actual_rc_i, node->details->uname);
 		    task_status_i = LRM_OP_ERROR;
 		}
 	}
 
 	if(task_status_i == LRM_OP_ERROR
 	   || task_status_i == LRM_OP_TIMEOUT
 	   || task_status_i == LRM_OP_NOTSUPPORTED) {
 	    action = custom_action(rsc, crm_strdup(id), task, NULL, TRUE, FALSE, data_set);
 	    if(expired) {
 		crm_notice("Ignoring expired failure (calculated) %s (rc=%d, magic=%s) on %s",
 			   id, actual_rc_i, magic, node->details->uname);
 		goto done;
 
 	    } else if(action->on_fail == action_fail_ignore) {
 		crm_warn("Remapping %s (rc=%d) on %s to DONE: ignore",
 			 id, actual_rc_i, node->details->uname);
 		task_status_i = LRM_OP_DONE;
 	    } 
 	}
 	
 	switch(task_status_i) {
 		case LRM_OP_PENDING:
 			if(safe_str_eq(task, CRMD_ACTION_START)) {
 				set_bit(rsc->flags, pe_rsc_start_pending);
 				set_active(rsc);
 				
 			} else if(safe_str_eq(task, CRMD_ACTION_PROMOTE)) {
 				rsc->role = RSC_ROLE_MASTER;
 			}
 			break;
 		
 		case LRM_OP_DONE:
 			crm_debug_3("%s/%s completed on %s",
 				    rsc->id, task, node->details->uname);
 
 			if(actual_rc_i == EXECRA_NOT_RUNNING) {
 			    /* nothing to do */
 			    
 			} else if(safe_str_eq(task, CRMD_ACTION_STOP)) {
 				rsc->role = RSC_ROLE_STOPPED;
 			    
 				/* clear any previous failure actions */
 				switch(*on_fail) {
 				    case action_fail_block:
 				    case action_fail_stop:
 				    case action_fail_fence:
 				    case action_fail_migrate:
 				    case action_fail_standby:
 					crm_debug_2("%s.%s is not cleared by a completed stop",
 						    rsc->id, fail2text(*on_fail));
 					break;
 
 				    case action_fail_ignore:
 				    case action_fail_recover:
 				    case action_migrate_failure:
 					*on_fail = action_fail_ignore;
 					rsc->next_role = RSC_ROLE_UNKNOWN;
 				}
 
 			} else if(safe_str_eq(task, CRMD_ACTION_PROMOTE)) {
 				rsc->role = RSC_ROLE_MASTER;
 
 			} else if(safe_str_eq(task, CRMD_ACTION_DEMOTE)) {
 				rsc->role = RSC_ROLE_SLAVE;
 				
 			} else if(rsc->role < RSC_ROLE_STARTED) {
 				crm_debug_3("%s active on %s",
 					    rsc->id, node->details->uname);
 				set_active(rsc);
 			}
 			break;
 
 		case LRM_OP_ERROR:
 		case LRM_OP_TIMEOUT:
 		case LRM_OP_NOTSUPPORTED:
 			crm_warn("Processing failed op %s on %s: %s (%d)",
 				 id, node->details->uname,
 				 execra_code2string(actual_rc_i), actual_rc_i);
 			crm_xml_add(xml_op, XML_ATTR_UNAME, node->details->uname);
 			add_node_copy(data_set->failed, xml_op);
 
 			if(*on_fail < action->on_fail) {
 				*on_fail = action->on_fail;
 			}
 
 			if(safe_str_eq(task, CRMD_ACTION_STOP)) {
 			    resource_location(
 				rsc, node, -INFINITY, "__stop_fail__", data_set);
 			    
 			} else if(safe_str_eq(task, CRMD_ACTION_PROMOTE)) {
 			    rsc->role = RSC_ROLE_MASTER;
 
 			} else if(safe_str_eq(task, CRMD_ACTION_DEMOTE)) {
 			    /*
 			     * staying in role=master ends up putting the PE/TE into a loop
 			     * setting role=slave is not dangerous because no master will be
 			     * promoted until the failed resource has been fully stopped
 			     */
 			    crm_warn("Forcing %s to stop after a failed demote action", rsc->id);
 			    rsc->next_role = RSC_ROLE_STOPPED;
 			    rsc->role = RSC_ROLE_SLAVE;
 				
 			} else if(compare_version("2.0", op_version) > 0
 				  && safe_str_eq(task, CRMD_ACTION_START)) {
 			    crm_warn("Compatibility handling for failed op %s on %s",
 				     id, node->details->uname);
 			    resource_location(
 				rsc, node, -INFINITY, "__legacy_start__", data_set);
 			}
 
 			if(rsc->role < RSC_ROLE_STARTED) {
 			    set_active(rsc);
 			}
 
 			crm_debug_2("Resource %s: role=%s, unclean=%s, on_fail=%s, fail_role=%s",
 				    rsc->id, role2text(rsc->role),
 				    node->details->unclean?"true":"false",
 				    fail2text(action->on_fail),
 				    role2text(action->fail_role));
 
 			if(action->fail_role != RSC_ROLE_STARTED
 			   && rsc->next_role < action->fail_role) {
 				rsc->next_role = action->fail_role;
 			}
 
 			if(action->fail_role == RSC_ROLE_STOPPED) {
 				crm_err("Making sure %s doesn't come up again", rsc->id);
 				/* make sure it doesnt come up again */
 				pe_free_shallow_adv(rsc->allowed_nodes, TRUE);
 				rsc->allowed_nodes = node_list_dup(
 					data_set->nodes, FALSE, FALSE);
 				slist_iter(
 					node, node_t, rsc->allowed_nodes, lpc,
 					node->weight = -INFINITY;
 					);
 			}
 			
 			pe_free_action(action);
 			action = NULL;
 			break;
 		case LRM_OP_CANCELLED:
 			/* do nothing?? */
 			pe_err("Dont know what to do for cancelled ops yet");
 			break;
 	}
 
   done:
 	crm_debug_3("Resource %s after %s: role=%s",
 		    rsc->id, task, role2text(rsc->role));
 
 	pe_free_action(action);
 	
 	return TRUE;
 }
 
 gboolean
 add_node_attrs(xmlNode *xml_obj, node_t *node, gboolean overwrite, pe_working_set_t *data_set)
 {
  	g_hash_table_insert(node->details->attrs,
 			    crm_strdup("#"XML_ATTR_UNAME),
 			    crm_strdup(node->details->uname));
  	g_hash_table_insert(node->details->attrs,
 			    crm_strdup("#"XML_ATTR_ID),
 			    crm_strdup(node->details->id));
 	if(safe_str_eq(node->details->id, data_set->dc_uuid)) {
 		data_set->dc_node = node;
 		node->details->is_dc = TRUE;
 		g_hash_table_insert(node->details->attrs,
 				    crm_strdup("#"XML_ATTR_DC),
 				    crm_strdup(XML_BOOLEAN_TRUE));
 	} else {
 		g_hash_table_insert(node->details->attrs,
 				    crm_strdup("#"XML_ATTR_DC),
 				    crm_strdup(XML_BOOLEAN_FALSE));
 	}
 	
 	unpack_instance_attributes(
 		data_set->input, xml_obj, XML_TAG_ATTR_SETS, NULL,
 		node->details->attrs, NULL, overwrite, data_set->now);
 
 	return TRUE;
 }
 
 static GListPtr
 extract_operations(const char *node, const char *rsc, xmlNode *rsc_entry, gboolean active_filter)
 {	
     int stop_index = -1;
     int start_index = -1;
     
     GListPtr op_list = NULL;
     GListPtr sorted_op_list = NULL;
 
     /* extract operations */
     op_list = NULL;
     sorted_op_list = NULL;
     
     xml_child_iter_filter(
 	rsc_entry, rsc_op, XML_LRM_TAG_RSC_OP,
 	crm_xml_add(rsc_op, "resource", rsc);
 	crm_xml_add(rsc_op, XML_ATTR_UNAME, node);
 	op_list = g_list_append(op_list, rsc_op);
 	);
     
     if(op_list == NULL) {
 	/* if there are no operations, there is nothing to do */
 	return NULL;
     }
     
     sorted_op_list = g_list_sort(op_list, sort_op_by_callid);
     
     /* create active recurring operations as optional */ 
     if(active_filter == FALSE) {
 	return sorted_op_list;
     }
     
     op_list = NULL;
     
     calculate_active_ops(sorted_op_list, &start_index, &stop_index);	
     slist_iter(rsc_op, xmlNode, sorted_op_list, lpc,
 	       if(start_index < stop_index) {
 		   crm_debug_4("Skipping %s: not active", ID(rsc_entry));
 		   break;
 		   
 	       } else if(lpc < start_index) {
 		   crm_debug_4("Skipping %s: old", ID(rsc_op));
 		   continue;
 	       }
 	       op_list = g_list_append(op_list, rsc_op);
 	);
     
     g_list_free(sorted_op_list);
     return op_list;
 }
 
 GListPtr find_operations(
     const char *rsc, const char *node, gboolean active_filter, pe_working_set_t *data_set) 
 {
     GListPtr output = NULL;
     GListPtr intermediate = NULL;
 
     xmlNode *tmp = NULL;
     xmlNode *status = find_xml_node(data_set->input, XML_CIB_TAG_STATUS, TRUE);
 
     const char *uname = NULL;
     node_t *this_node = NULL;
     
     xml_child_iter_filter(
 	status, node_state, XML_CIB_TAG_STATE,
 	
 	uname = crm_element_value(node_state, XML_ATTR_UNAME);
 	if(node != NULL && safe_str_neq(uname, node)) {
 	    continue;
 	}
 
 	this_node = pe_find_node(data_set->nodes, uname);
 	CRM_CHECK(this_node != NULL, continue);
 	
 	determine_online_status(node_state, this_node, data_set);
 	
 	if(this_node->details->online || is_set(data_set->flags, pe_flag_stonith_enabled)) {
 	    /* offline nodes run no resources...
 	     * unless stonith is enabled in which case we need to
 	     *   make sure rsc start events happen after the stonith
 	     */
 	    tmp = find_xml_node(node_state, XML_CIB_TAG_LRM, FALSE);
 	    tmp = find_xml_node(tmp, XML_LRM_TAG_RESOURCES, FALSE);
 
 	    xml_child_iter_filter(
 		tmp, lrm_rsc, XML_LRM_TAG_RESOURCE,
 		const char *rsc_id  = crm_element_value(lrm_rsc, XML_ATTR_ID);
 		if(rsc != NULL && safe_str_neq(rsc_id, rsc)) {
 		    continue;
 		}
 
 		intermediate = extract_operations(uname, rsc_id, lrm_rsc, active_filter);
 		output = g_list_concat(output, intermediate);
 		);
 	}
 	);
 
     return output;
 }