Send Linux-ha-cvs mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of Linux-ha-cvs digest..."
Today's Topics:
1. Linux-HA CVS: crm by andrew from
([email protected])
2. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Wed, 15 Feb 2006 06:17:16 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm/pengine
Modified Files:
unpack.c utils.c native.c
Log Message:
Logging updates
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/unpack.c,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -3 -r1.154 -r1.155
--- unpack.c 14 Feb 2006 12:08:54 -0000 1.154
+++ unpack.c 15 Feb 2006 13:17:16 -0000 1.155
@@ -1,4 +1,4 @@
-/* $Id: unpack.c,v 1.154 2006/02/14 12:08:54 andrew Exp $ */
+/* $Id: unpack.c,v 1.155 2006/02/15 13:17:16 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -833,12 +833,14 @@
/* no need to free the contents */
g_list_free(sorted_op_list);
- crm_debug("Resource %s is %s on %s",
- rsc->id, role2text(rsc->role), node->details->uname);
+ crm_debug_2("Resource %s is %s on %s",
+ rsc->id, role2text(rsc->role),
+ node->details->uname);
rsc->known_on = g_list_append(rsc->known_on, node);
if(rsc->role != RSC_ROLE_STOPPED) {
- crm_debug_2("Adding %s to %s", rsc->id,
node->details->uname);
+ crm_debug_2("Adding %s to %s",
+ rsc->id, node->details->uname);
native_add_running(rsc, node, data_set);
if(on_fail != action_fail_ignore) {
@@ -1339,7 +1341,7 @@
} else {
/* make sure its already created and is optional
*
- * creating it now tells
create_recurring_actions()
+ * creating it now tells Recurring()
* that it can safely leave it optional
*/
if(rsc->role < RSC_ROLE_STARTED) {
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/utils.c,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -3 -r1.123 -r1.124
--- utils.c 14 Feb 2006 12:06:31 -0000 1.123
+++ utils.c 15 Feb 2006 13:17:16 -0000 1.124
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.123 2006/02/14 12:06:31 andrew Exp $ */
+/* $Id: utils.c,v 1.124 2006/02/15 13:17:16 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -784,9 +784,11 @@
action->runnable = FALSE;
crm_warn("Action %s on %s is unrunnable (offline)",
action->uuid, action->node->details->uname);
- if(save_action && a_task == stop_rsc) {
- pe_proc_warn("Marking node %s unclean",
- action->node->details->uname);
+ if(action->rsc->is_managed
+ && save_action
+ && a_task == stop_rsc) {
+ pe_proc_err("Marking node %s unclean",
+ action->node->details->uname);
action->node->details->unclean = TRUE;
}
@@ -806,17 +808,18 @@
} else if(data_set->have_quorum == FALSE
&& data_set->no_quorum_policy == no_quorum_stop) {
action->runnable = FALSE;
- crm_warn("%s resource %s\t(%s) (cancelled : quorum)",
- action->task, rsc->id,
action->node->details->uname);
-
+ crm_debug("%s\t%s %s (cancelled : quorum)",
+ action->node->details->uname,
+ action->task, rsc->id);
+
} else if(data_set->have_quorum == FALSE
&& data_set->no_quorum_policy == no_quorum_freeze) {
crm_debug_2("Check resource is already active");
if(rsc->fns->active(rsc, TRUE) == FALSE) {
action->runnable = FALSE;
- crm_warn("%s resource %s\t(%s) (cancelled :
quorum freeze)",
- action->task, rsc->id,
- action->node->details->uname);
+ crm_debug("%s\t%s %s (cancelled : quorum
freeze)",
+ action->node->details->uname,
+ action->task, rsc->id);
}
} else {
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/native.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -3 -r1.110 -r1.111
--- native.c 14 Feb 2006 12:59:05 -0000 1.110
+++ native.c 15 Feb 2006 13:17:16 -0000 1.111
@@ -1,4 +1,4 @@
-/* $Id: native.c,v 1.110 2006/02/14 12:59:05 andrew Exp $ */
+/* $Id: native.c,v 1.111 2006/02/15 13:17:16 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -43,7 +43,7 @@
int num_allowed_nodes4color(color_t *color);
void create_notifications(resource_t *rsc, pe_working_set_t *data_set);
-void create_recurring_actions(resource_t *rsc, action_t *start, node_t *node,
+void Recurring(resource_t *rsc, action_t *start, node_t *node,
pe_working_set_t *data_set);
void pe_pre_notify(
resource_t *rsc, node_t *node, action_t *op,
@@ -134,10 +134,8 @@
/* these are errors because hardly any gets it right
* at the moment and this way the might notice
*/
- pe_err("Resource %s::%s:%s is (potentially) active on %d nodes."
- " Latest: %s/%s", class, type, rsc->id,
- g_list_length(rsc->running_on),
- node->details->uname, node->details->id);
+ pe_err("Resource %s::%s:%s appears to be active on %d nodes.",
+ class, type, rsc->id, g_list_length(rsc->running_on));
cl_log(LOG_ERR, "See %s for more information.",
HAURL("v2/faq/resource_too_active"));
@@ -380,7 +378,7 @@
}
void
-create_recurring_actions(resource_t *rsc, action_t *start, node_t *node,
+Recurring(resource_t *rsc, action_t *start, node_t *node,
pe_working_set_t *data_set)
{
char *key = NULL;
@@ -440,19 +438,19 @@
is_optional, TRUE, data_set);
if(start == NULL || start->runnable == FALSE) {
- crm_warn(" %s:\t(%s) (cancelled : start un-runnable)",
- mon->uuid, crm_str(node_uname));
+ crm_debug("%s:\t %s (cancelled : start un-runnable)",
+ crm_str(node_uname), mon->uuid);
mon->runnable = FALSE;
} else if(node == NULL
|| node->details->online == FALSE
|| node->details->unclean) {
- crm_warn(" %s:\t(%s) (cancelled : no node available)",
- mon->uuid, crm_str(node_uname));
+ crm_debug("%s:\t %s (cancelled : no node available)",
+ crm_str(node_uname), mon->uuid);
mon->runnable = FALSE;
} else if(mon->optional == FALSE) {
- crm_notice(" %s:\t(%s)", mon->uuid,
crm_str(node_uname));
+ crm_notice("%s:\t %s", crm_str(node_uname),mon->uuid);
}
custom_action_order(rsc, start_key(rsc), NULL,
NULL, crm_strdup(key), mon,
@@ -517,7 +515,7 @@
if(rsc->next_role != RSC_ROLE_STOPPED && rsc->is_managed) {
start = start_action(rsc, chosen, TRUE);
- create_recurring_actions(rsc, start, chosen, data_set);
+ Recurring(rsc, start, chosen, data_set);
}
}
@@ -1839,8 +1837,7 @@
slist_iter(
current, node_t, rsc->running_on, lpc,
- crm_notice("Stop resource %s\t(%s)",
- rsc->id, current->details->uname);
+ crm_notice(" %s\tStop %s", current->details->uname, rsc->id);
stop = stop_action(rsc, current, FALSE);
if(data_set->remove_after_stop) {
@@ -1915,8 +1912,7 @@
crm_debug_2("Executing: %s", rsc->id);
start = start_action(rsc, next, TRUE);
if(start->runnable) {
- crm_notice("Start resource %s\t(%s)",
- rsc->id, next->details->uname);
+ crm_notice(" %s\tStart %s", next->details->uname, rsc->id);
start->optional = FALSE;
}
return TRUE;
@@ -1928,7 +1924,7 @@
crm_debug_2("Executing: %s", rsc->id);
CRM_DEV_ASSERT(rsc->next_role == RSC_ROLE_MASTER);
- crm_notice("Promote resource %s\t(%s)", rsc->id, next->details->uname);
+ crm_notice("%s\tPromote %s", next->details->uname, rsc->id);
promote_action(rsc, next, FALSE);
return TRUE;
}
@@ -1941,8 +1937,7 @@
CRM_DEV_ASSERT(rsc->next_role == RSC_ROLE_SLAVE);
slist_iter(
current, node_t, rsc->running_on, lpc,
- crm_notice("Demote resource %s\t(%s)",
- rsc->id, current->details->uname);
+ crm_notice("%s\tDeomote %s", next->details->uname, rsc->id);
demote_action(rsc, current, FALSE);
);
return TRUE;
@@ -1989,7 +1984,7 @@
probe = custom_action(rsc, key, CRMD_ACTION_STATUS, node,
FALSE, TRUE, data_set);
- crm_notice("Created probe for %s on %s", rsc->id, node->details->uname);
+ crm_notice("%s: Created probe for %s", node->details->uname, rsc->id);
g_hash_table_insert(probe->extra,
crm_strdup(XML_ATTR_TE_TARGET_RC), target_rc);
------------------------------
Message: 2
Date: Wed, 15 Feb 2006 06:18:12 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm/crmd
Modified Files:
callbacks.c ccm.c fsa.c
Log Message:
Some updates to possibly help with bug 1092: Rejoining partitions
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/ccm.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -3 -r1.95 -r1.96
--- ccm.c 14 Feb 2006 11:52:26 -0000 1.95
+++ ccm.c 15 Feb 2006 13:18:11 -0000 1.96
@@ -1,4 +1,4 @@
-/* $Id: ccm.c,v 1.95 2006/02/14 11:52:26 andrew Exp $ */
+/* $Id: ccm.c,v 1.96 2006/02/15 13:18:11 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -188,17 +188,7 @@
CRM_DEV_ASSERT(oc->m_n_in != 0 || oc->m_n_out != 0);
- if(AM_I_DC) {
- /* Membership changed, remind everyone we're here.
- * This will aid detection of duplicate DCs
- */
- HA_Message *no_op = create_request(
- CRM_OP_NOOP, NULL, NULL,
- CRM_SYSTEM_DC, CRM_SYSTEM_CRMD, NULL);
-
- send_msg_via_ha(fsa_cluster_conn, no_op);
-
- } else if(oc->m_n_out != 0) {
+ if(AM_I_DC == FALSE && oc->m_n_out != 0) {
/* Possibly move this logic to ghash_update_cib_node() */
unsigned lpc = 0;
int offset = oc->m_out_idx;
@@ -245,10 +235,14 @@
const oc_ev_membership_t *oc = NULL;
oc_node_list_t *tmp = NULL, *membership_copy = NULL;
struct crmd_ccm_data_s *ccm_data = fsa_typed_data(fsa_dt_ccm);
-
+ HA_Message *no_op = create_request(
+ CRM_OP_NOOP, NULL, NULL,
+ AM_I_DC?CRM_SYSTEM_DC:CRM_SYSTEM_CRMD, CRM_SYSTEM_CRMD, NULL);
+
if(ccm_data == NULL) {
crm_err("No data provided to FSA function");
register_fsa_error(C_FSA_INTERNAL, I_FAIL, NULL);
+ send_msg_via_ha(fsa_cluster_conn, no_op);
return I_NULL;
}
@@ -472,7 +466,11 @@
do_update_cib_nodes(NULL, FALSE);
}
-
+ /* Membership changed, remind everyone we're here.
+ * This will aid detection of duplicate DCs
+ */
+ send_msg_via_ha(fsa_cluster_conn, no_op);
+
return next_input;
}
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/fsa.c,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -3 -r1.137 -r1.138
--- fsa.c 14 Feb 2006 11:55:07 -0000 1.137
+++ fsa.c 15 Feb 2006 13:18:12 -0000 1.138
@@ -670,6 +670,7 @@
break;
case S_FINALIZE_JOIN:
+ CRM_DEV_ASSERT(AM_I_DC);
if(cause == C_TIMER_POPPED) {
crm_warn("Progressed to state %s after %s",
fsa_state2string(next_state),
@@ -694,6 +695,7 @@
break;
case S_POLICY_ENGINE:
+ CRM_DEV_ASSERT(AM_I_DC);
if(cause == C_TIMER_POPPED) {
crm_warn("Progressed to state %s after %s",
fsa_state2string(next_state),
@@ -738,6 +740,7 @@
break;
case S_IDLE:
+ CRM_DEV_ASSERT(AM_I_DC);
dump_rsc_info();
if(is_set(fsa_input_register, R_SHUTDOWN)){
crm_info("(Re)Issuing shutdown request now"
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 27, Issue 64
********************************************
