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: cts by andrew from
([email protected])
2. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Wed, 11 Jan 2006 06:06:12 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: cts by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : cts
Dir : linux-ha/cts
Modified Files:
CM_LinuxHAv2.py.in
Log Message:
Logging enhancements
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cts/CM_LinuxHAv2.py.in,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -3 -r1.124 -r1.125
--- CM_LinuxHAv2.py.in 18 Oct 2005 14:55:31 -0000 1.124
+++ CM_LinuxHAv2.py.in 11 Jan 2006 13:06:11 -0000 1.125
@@ -330,7 +330,7 @@
'''Report the status of the cluster manager on a given node'''
watchpats = [ ]
- watchpats.append("Current state: (S_IDLE|S_NOT_DC)")
+ watchpats.append("Current ping state: (S_IDLE|S_NOT_DC)")
watchpats.append(self["Pat:They_started"]%node)
idle_watch = CTS.LogWatcher(self["LogFileName"], watchpats)
idle_watch.setwatch()
@@ -390,7 +390,7 @@
def cluster_stable(self, timeout=None):
watchpats = [ ]
- watchpats.append("Current state: S_IDLE")
+ watchpats.append("Current ping state: S_IDLE")
watchpats.append(self["Pat:DC_IDLE"])
if timeout == None:
------------------------------
Message: 2
Date: Wed, 11 Jan 2006 06:06: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 cib.c join_client.c join_dc.c lrm.c messages.c
Log Message:
Logging enhancements
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/callbacks.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -3 -r1.95 -r1.96
--- callbacks.c 10 Jan 2006 13:46:41 -0000 1.95
+++ callbacks.c 11 Jan 2006 13:06:11 -0000 1.96
@@ -273,8 +273,8 @@
return;
}
- crm_debug("received callback: %s/%s (%s)",
- op->op_type, op->rsc_id, op_status2text(op->op_status));
+ crm_debug_2("received callback: %s/%s (%s)",
+ op->op_type, op->rsc_id, op_status2text(op->op_status));
/* Make sure the LRM events are received in order */
register_fsa_input_later(C_LRM_OP_CALLBACK, I_LRM_EVENT, op);
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/cib.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- cib.c 18 Oct 2005 11:43:52 -0000 1.43
+++ cib.c 11 Jan 2006 13:06:11 -0000 1.44
@@ -105,7 +105,7 @@
static void
do_cib_replaced(const char *event, HA_Message *msg)
{
- crm_info("Updating the CIB after a replace");
+ crm_debug("Updating the CIB after a replace");
do_update_cib_nodes(NULL, FALSE);
fsa_cluster_conn->llc_ops->client_status(
fsa_cluster_conn, NULL, CRM_SYSTEM_CRMD, -1);
@@ -136,63 +136,68 @@
}
if(action & start_actions) {
- if(cur_state != S_STOPPING) {
- if(fsa_cib_conn == NULL) {
- fsa_cib_conn = cib_new();
- }
- if(cib_ok != fsa_cib_conn->cmds->signon(
- fsa_cib_conn, CRM_SYSTEM_CRMD, cib_command)){
- crm_debug("Could not connect to the CIB
service");
+ if(fsa_cib_conn == NULL) {
+ fsa_cib_conn = cib_new();
+ }
+
+ if(cur_state == S_STOPPING) {
+ crm_err("Ignoring request to start %s after shutdown",
+ this_subsys->name);
+ return I_NULL;
+ }
+
+ if(cib_ok != fsa_cib_conn->cmds->signon(
+ fsa_cib_conn, CRM_SYSTEM_CRMD, cib_command)){
+ crm_debug("Could not connect to the CIB service");
#if 0
- } else if(cib_ok != fsa_cib_conn->cmds->set_op_callback(
- fsa_cib_conn, crmd_cib_op_callback)) {
- crm_err("Could not set op callback");
+ } else if(cib_ok != fsa_cib_conn->cmds->set_op_callback(
+ fsa_cib_conn, crmd_cib_op_callback)) {
+ crm_err("Could not set op callback");
#endif
- } else if(cib_ok !=
fsa_cib_conn->cmds->set_connection_dnotify(
- fsa_cib_conn,
crmd_cib_connection_destroy)) {
- crm_err("Could not set dnotify callback");
-
- } else if(cib_ok !=
fsa_cib_conn->cmds->add_notify_callback(
- fsa_cib_conn, T_CIB_REPLACE_NOTIFY,
- do_cib_replaced)) {
- crm_err("Could not set CIB notification
callback");
-
- } else {
- set_bit_inplace(
- fsa_input_register, R_CIB_CONNECTED);
- }
-
- if(is_set(fsa_input_register, R_CIB_CONNECTED) ==
FALSE) {
-
- cib_retries++;
- crm_warn("Couldn't complete CIB registration %d"
- " times... pause and retry",
- cib_retries);
-
- if(cib_retries < 30) {
- crm_timer_start(wait_timer);
- crmd_fsa_stall(NULL);
-
- } else {
- crm_err("Could not complete CIB"
- " registration %d times..."
- " hard error", cib_retries);
- register_fsa_error(
- C_FSA_INTERNAL, I_ERROR, NULL);
- }
+ } else if(cib_ok != fsa_cib_conn->cmds->set_connection_dnotify(
+ fsa_cib_conn, crmd_cib_connection_destroy)) {
+ crm_err("Could not set dnotify callback");
+
+ } else if(cib_ok != fsa_cib_conn->cmds->add_notify_callback(
+ fsa_cib_conn, T_CIB_REPLACE_NOTIFY,
+ do_cib_replaced)) {
+ crm_err("Could not set CIB notification callback");
+
+ } else {
+ set_bit_inplace(
+ fsa_input_register, R_CIB_CONNECTED);
+ }
+
+ if(is_set(fsa_input_register, R_CIB_CONNECTED) == FALSE) {
+
+ cib_retries++;
+ crm_warn("Couldn't complete CIB registration %d"
+ " times... pause and retry",
+ cib_retries);
+
+ if(cib_retries < 30) {
+ crm_timer_start(wait_timer);
+ crmd_fsa_stall(NULL);
+
} else {
- int rc = fsa_cib_conn->cmds->query(
- fsa_cib_conn, NULL, NULL,
- cib_scope_local);
-
- add_cib_op_callback(rc, FALSE, NULL,
- revision_check_callback);
- cib_retries = 0;
+ crm_err("Could not complete CIB"
+ " registration %d times..."
+ " hard error", cib_retries);
+ register_fsa_error(
+ C_FSA_INTERNAL, I_ERROR, NULL);
}
-
} else {
- crm_info("Ignoring request to start %s after shutdown",
- this_subsys->name);
+ int call_id = 0;
+
+ crm_info("CIB connection established");
+
+ call_id = fsa_cib_conn->cmds->query(
+ fsa_cib_conn, NULL, NULL,
+ cib_scope_local);
+
+ add_cib_op_callback(call_id, FALSE, NULL,
+ revision_check_callback);
+ cib_retries = 0;
}
}
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/join_client.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- join_client.c 20 Oct 2005 14:11:37 -0000 1.32
+++ join_client.c 11 Jan 2006 13:06:11 -0000 1.33
@@ -237,10 +237,11 @@
gboolean was_nack = TRUE;
ha_msg_input_t *input = fsa_typed_data(fsa_dt_ha_msg);
+ int join_id = -1;
const char *op = cl_get_string(input->msg,F_CRM_TASK);
const char *ack_nack = cl_get_string(input->msg,CRM_OP_JOIN_ACKNAK);
const char *welcome_from = cl_get_string(input->msg,F_CRM_HOST_FROM);
-
+
if(safe_str_neq(op, CRM_OP_JOIN_ACKNAK)) {
crm_debug_2("Ignoring op=%s message", op);
return I_NULL;
@@ -250,9 +251,11 @@
if(crm_is_true(ack_nack)) {
was_nack = FALSE;
}
+
+ ha_msg_value_int(input->msg, F_CRM_JOIN_ID, &join_id);
if(was_nack) {
- crm_err("Join with %s failed. NACK'd", welcome_from);
+ crm_err("Join %d with %s failed. NACK'd", join_id,
welcome_from);
register_fsa_error(C_FSA_INTERNAL, I_ERROR, NULL);
return I_NULL;
}
@@ -266,8 +269,8 @@
}
/* send our status section to the DC */
- crm_debug("c3) confirming join: %s",
- cl_get_string(input->msg, F_CRM_TASK));
+ crm_debug("c3) confirming join %d: %s",
+ join_id, cl_get_string(input->msg, F_CRM_TASK));
crm_debug_2("Discovering local LRM status");
tmp1 = do_lrm_query(TRUE);
if(tmp1 != NULL) {
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/join_dc.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -3 -r1.74 -r1.75
--- join_dc.c 10 Jan 2006 13:46:42 -0000 1.74
+++ join_dc.c 11 Jan 2006 13:06:11 -0000 1.75
@@ -468,15 +468,15 @@
/* set the ack/nack */
if(safe_str_eq(join_state, CRMD_JOINSTATE_MEMBER)) {
- crm_debug("3) ACK'ing join request from %s, state %s",
- join_to, join_state);
+ crm_debug("3) ACK'ing join request %d from %s, state %s",
+ current_join_id, join_to, join_state);
ha_msg_add(acknak, CRM_OP_JOIN_ACKNAK, XML_BOOLEAN_TRUE);
g_hash_table_insert(
finalized_nodes,
crm_strdup(join_to), crm_strdup(CRMD_JOINSTATE_MEMBER));
} else {
- crm_warn("3) NACK'ing join request from %s, state %s",
- join_to, join_state);
+ crm_warn("3) NACK'ing join request %d from %s, state %s",
+ current_join_id, join_to, join_state);
ha_msg_add(acknak, CRM_OP_JOIN_ACKNAK, XML_BOOLEAN_FALSE);
}
@@ -563,7 +563,7 @@
g_hash_table_insert(welcomed_nodes, crm_strdup(join_to),
crm_strdup(CRMD_JOINSTATE_PENDING));
} else {
- crm_debug("Peer process on %s is not active", join_to);
+ crm_err("Peer process on %s is not active", join_to);
}
}
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/lrm.c,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -3 -r1.158 -r1.159
--- lrm.c 10 Jan 2006 13:46:42 -0000 1.158
+++ lrm.c 11 Jan 2006 13:06:11 -0000 1.159
@@ -179,15 +179,15 @@
if(action & A_LRM_DISCONNECT) {
if(fsa_lrm_conn) {
gboolean removed = FALSE;
- crm_info("Removing LRM connection from MainLoop");
+ crm_debug("Removing LRM connection from MainLoop");
removed = G_main_del_IPC_Channel(lrm_source);
if(removed == FALSE) {
crm_err("Could not remove LRM connection"
" from MainLoop");
}
lrm_source = NULL;
- crm_info("Disconnecting from the LRM");
fsa_lrm_conn->lrm_ops->signoff(fsa_lrm_conn);
+ crm_info("Disconnected from the LRM");
clear_bit_inplace(fsa_input_register, R_LRM_CONNECTED);
}
/* TODO: Clean up the hashtable */
@@ -220,7 +220,7 @@
}
if(ret == HA_OK) {
- crm_info("Connecting to the LRM");
+ crm_debug("Connecting to the LRM");
ret = fsa_lrm_conn->lrm_ops->signon(
fsa_lrm_conn, CRM_SYSTEM_CRMD);
}
@@ -264,6 +264,7 @@
default_ipc_connection_destroy);
set_bit_inplace(fsa_input_register, R_LRM_CONNECTED);
+ crm_debug("LRM connection established");
}
@@ -333,11 +334,11 @@
return FALSE;
}
- crm_debug("%s: Updating resouce %s after %s %s op",
+ crm_debug_2("%s: Updating resouce %s after %s %s op",
src, op->rsc_id, op_status2text(op->op_status), op->op_type);
if(op->op_status == LRM_OP_CANCELLED) {
- crm_debug("Ignoring cancelled op");
+ crm_debug_3("Ignoring cancelled op");
return TRUE;
}
@@ -514,7 +515,7 @@
the_rsc = fsa_lrm_conn->lrm_ops->get_rsc(fsa_lrm_conn, rsc_id);
- crm_debug("Processing lrm_rsc_t entry %s", rsc_id);
+ crm_debug_2("Processing lrm_rsc_t entry %s", rsc_id);
if(the_rsc == NULL) {
crm_err("NULL resource returned from the LRM");
@@ -523,13 +524,13 @@
op_list = the_rsc->ops->get_cur_state(the_rsc, &cur_state);
- crm_debug_2("\tcurrent state:%s",cur_state==LRM_RSC_IDLE?"Idle":"Busy");
+ crm_debug_3("\tcurrent state:%s",cur_state==LRM_RSC_IDLE?"Idle":"Busy");
slist_iter(
op, lrm_op_t, op_list, llpc,
- crm_debug("Processing op %s for %s (status=%d, rc=%d)",
- op->op_type, the_rsc->id, op->op_status, op->rc);
+ crm_debug_2("Processing op %s for %s (status=%d, rc=%d)",
+ op->op_type, the_rsc->id, op->op_status, op->rc);
CRM_ASSERT(max_call_id <= op->call_id);
if(safe_str_eq(op->op_type, CRMD_ACTION_STOP)) {
@@ -1100,8 +1101,9 @@
}
/* now do the op */
- crm_info("Performing op %s on %s", operation, rid);
op = construct_op(msg, rsc->id, operation);
+ crm_info("Performing op %s on %s (interval=%dms)",
+ operation, rid, op->interval);
if((AM_I_DC == FALSE && fsa_state != S_NOT_DC)
|| (AM_I_DC && fsa_state != S_TRANSITION_ENGINE)) {
@@ -1139,8 +1141,8 @@
} else if(op->interval > 0) {
struct recurring_op_s *op = NULL;
crm_malloc0(op, sizeof(struct recurring_op_s));
- crm_debug("Adding recurring %s op for %s (%d)",
- op_id, rsc->id, call_id);
+ crm_debug_2("Adding recurring %s op for %s (%d)",
+ op_id, rsc->id, call_id);
op->call_id = call_id;
op->rsc_id = crm_strdup(rsc->id);
@@ -1154,8 +1156,8 @@
char *call_id_s = make_stop_id(rsc->id, call_id);
g_hash_table_replace(
shutdown_ops, call_id_s, crm_strdup(rsc->id));
- crm_debug("Recording pending op: %s/%s %s",
- rsc->id, operation, call_id_s);
+ crm_debug_2("Recording pending op: %s/%s %s",
+ rsc->id, operation, call_id_s);
}
crm_free(op_id);
@@ -1329,8 +1331,8 @@
crm_xml_add(iter, XML_ATTR_ID, op->rsc_id);
if(op->interval == 0) {
lrm_rsc_t *rsc = NULL;
- crm_info("Updating %s resource definitions after %s op",
- op->rsc_id, op->op_type);
+ crm_debug_2("Updating %s resource definitions after %s op",
+ op->rsc_id, op->op_type);
rsc = fsa_lrm_conn->lrm_ops->get_rsc(fsa_lrm_conn, op->rsc_id);
@@ -1479,11 +1481,11 @@
op_status2text(op->op_status));
break;
case LRM_OP_DONE:
- crm_debug("LRM operation (%d) %s_%d on %s %s",
- op->call_id, op->op_type,
- op->interval,
- crm_str(op->rsc_id),
- op_status2text(op->op_status));
+ crm_info("LRM operation (%d) %s_%d on %s %s",
+ op->call_id, op->op_type,
+ op->interval,
+ crm_str(op->rsc_id),
+ op_status2text(op->op_status));
break;
}
g_hash_table_replace(resources_confirmed,
@@ -1494,7 +1496,7 @@
if(g_hash_table_size(shutdown_ops) > 0) {
char *op_id = make_stop_id(op->rsc_id, op->call_id);
if(g_hash_table_remove(shutdown_ops, op_id)) {
- crm_debug("Op %d (%s %s) confirmed",
+ crm_debug_2("Op %d (%s %s) confirmed",
op->call_id, op->op_type, op->rsc_id);
} else if(op->interval == 0) {
@@ -1509,9 +1511,9 @@
register_fsa_input(C_FSA_INTERNAL, I_TERMINATE, NULL);
} else {
- crm_debug("Still waiting for %d pending stop operations"
- " to complete before exiting",
- g_hash_table_size(shutdown_ops));
+ crm_info("Still waiting for %d pending stop operations"
+ " to complete before exiting",
+ g_hash_table_size(shutdown_ops));
g_hash_table_foreach(
shutdown_ops, ghash_print_pending, NULL);
}
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/messages.c,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -3 -r1.139 -r1.140
--- messages.c 10 Jan 2006 13:46:42 -0000 1.139
+++ messages.c 11 Jan 2006 13:06:11 -0000 1.140
@@ -704,7 +704,7 @@
if(table_key == NULL) {
table_key = (gpointer)crm_strdup(client_name);
}
- crm_debug("Accepted client %s", crm_str(table_key));
+ crm_debug_2("Accepted client %s", crm_str(table_key));
curr_client->table_key = table_key;
curr_client->sub_sys = crm_strdup(client_name);
@@ -791,7 +791,7 @@
/*========== common actions ==========*/
} else if(strcmp(op, CRM_OP_NOOP) == 0) {
- crm_debug("no-op from %s", crm_str(host_from));
+ crm_debug_2("no-op from %s", crm_str(host_from));
} else if(strcmp(op, CRM_OP_NOVOTE) == 0) {
register_fsa_input_adv(C_HA_MESSAGE, I_NULL, stored_msg,
@@ -827,7 +827,7 @@
crm_xml_add(ping, "crmd_state", fsa_state2string(fsa_state));
- crm_info("Current state: %s", fsa_state2string(fsa_state));
+ crm_info("Current ping state: %s", fsa_state2string(fsa_state));
msg = create_reply(stored_msg->msg, ping);
@@ -1016,17 +1016,17 @@
} else if(AM_I_DC && strcmp(op, CRM_OP_PECALC) == 0) {
- crm_debug("Processing %s reply %s (fsa=%s)",
+ crm_debug_2("Processing %s reply %s (fsa=%s)",
sys_from, msg_ref, crm_str(fsa_pe_ref));
if(msg_ref != NULL && safe_str_eq(msg_ref, fsa_pe_ref)) {
next_input = I_PE_SUCCESS;
- crm_debug("Completed: %s...", fsa_pe_ref);
+ crm_debug_2("Completed: %s...", fsa_pe_ref);
crm_free(fsa_pe_ref);
fsa_pe_ref = NULL;
} else {
- crm_debug("Skipping superceeded reply from %s",
+ crm_debug_2("Skipping superceeded reply from %s",
sys_from);
}
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 26, Issue 18
********************************************
