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: membership by zhenh from
([email protected])
2. Linux-HA CVS: crm by andrew from
([email protected])
3. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Thu, 16 Feb 2006 22:52:12 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: membership by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : membership
Dir : linux-ha/membership/ccm
Modified Files:
ccmmisc.h
Log Message:
change the log in ccm
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/membership/ccm/ccmmisc.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ccmmisc.h 6 Oct 2005 20:03:16 -0000 1.6
+++ ccmmisc.h 17 Feb 2006 05:52:12 -0000 1.7
@@ -39,7 +39,6 @@
gboolean part_of_cluster(int state);
int ccm_string2type(const char *type);
char* ccm_type2string(enum ccm_type type);
-void ccm_log(int priority, const char * fmt, ...) G_GNUC_PRINTF(2,3);
void ccm_mem_reset(ccm_info_t* info);
int ccm_mem_add(ccm_info_t*, int index);
------------------------------
Message: 2
Date: Fri, 17 Feb 2006 06:20:04 -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/cib
Modified Files:
callbacks.c notify.c notify.h
Log Message:
Logging - identify updates with the client and call that made them
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/callbacks.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -3 -r1.110 -r1.111
--- callbacks.c 16 Feb 2006 15:27:43 -0000 1.110
+++ callbacks.c 17 Feb 2006 13:20:03 -0000 1.111
@@ -1,4 +1,4 @@
-/* $Id: callbacks.c,v 1.110 2006/02/16 15:27:43 andrew Exp $ */
+/* $Id: callbacks.c,v 1.111 2006/02/17 13:20:03 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -524,6 +524,7 @@
call_start = time_longclock();
cib_client->num_calls++;
op = cl_get_string(op_request, F_CIB_OPERATION);
+
rc = cib_get_operation_id(op_request, &call_type);
if(rc != cib_ok) {
crm_debug("Invalid operation %s from %s/%s",
@@ -538,9 +539,8 @@
}
crm_log_message_adv(LOG_MSG, "Client[inbound]", op_request);
- CRM_DEV_ASSERT(
- ha_msg_add(
- op_request, F_CIB_CLIENTID, cib_client->id) == HA_OK);
+ ha_msg_add(op_request, F_CIB_CLIENTID, cib_client->id);
+ ha_msg_add(op_request, F_CIB_CLIENTNAME, cib_client->name);
if(rc == cib_ok && crm_assert_failed == FALSE) {
cib_process_request(
@@ -1085,8 +1085,13 @@
}
if((call_options & cib_inhibit_notify) == 0) {
+ const char *call_id = cl_get_string(
+ request, F_CIB_CALLID);
+ const char *client = cl_get_string(
+ request, F_CIB_CLIENTNAME);
cib_post_notify(call_options, op, input, rc, the_cib);
- cib_diff_notify(call_options, op, input, rc, *cib_diff);
+ cib_diff_notify(call_options, client, call_id, op,
+ input, rc, *cib_diff);
}
log_xml_diff(rc==cib_ok?cib_diff_loglevel:cib_diff_loglevel+1,
@@ -1424,6 +1429,10 @@
ha_msg_value_int(msg, F_CIB_CALLOPTS, &call_options);
crm_debug_4("Retrieved call options: %d", call_options);
+
+ if(cl_get_string(msg, F_CIB_CLIENTNAME) == NULL) {
+ ha_msg_add(msg, F_CIB_CLIENTNAME, originator);
+ }
cib_process_request(msg, FALSE, TRUE, TRUE, NULL);
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/notify.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- notify.c 23 Jan 2006 16:19:07 -0000 1.35
+++ notify.c 17 Feb 2006 13:20:03 -0000 1.36
@@ -1,4 +1,4 @@
-/* $Id: notify.c,v 1.35 2006/01/23 16:19:07 andrew Exp $ */
+/* $Id: notify.c,v 1.36 2006/02/17 13:20:03 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -232,8 +232,9 @@
}
void
-cib_diff_notify(int options, const char *op, crm_data_t *update,
- enum cib_errors result, crm_data_t *diff)
+cib_diff_notify(
+ int options, const char *client, const char *call_id, const char *op,
+ crm_data_t *update, enum cib_errors result, crm_data_t *diff)
{
int add_updates = 0;
int add_epoch = 0;
@@ -258,14 +259,19 @@
&del_admin_epoch, &del_epoch, &del_updates);
if(add_updates != del_updates) {
- crm_log_maybe(log_level, "Update (%s): %d.%d.%d -> %d.%d.%d",
- cib_error2string(result),
+ crm_log_maybe(log_level,
+ "Update (client: %s%s%s): %d.%d.%d -> %d.%d.%d
(%s)",
+ client, call_id?", call:":"", call_id?call_id:"",
del_admin_epoch, del_epoch, del_updates,
- add_admin_epoch, add_epoch, add_updates);
+ add_admin_epoch, add_epoch, add_updates,
+ cib_error2string(result));
+
} else if(diff != NULL) {
- crm_log_maybe(log_level, "Local-only Change (%s): %d.%d.%d",
- cib_error2string(result),
- add_admin_epoch, add_epoch, add_updates);
+ crm_log_maybe(log_level,
+ "Local-only Change (client:%s%s%s): %d.%d.%d
(%s)",
+ client, call_id?", call: ":"", call_id?call_id:"",
+ add_admin_epoch, add_epoch, add_updates,
+ cib_error2string(result));
}
do_cib_notify(options, op, update, result, diff, T_CIB_DIFF_NOTIFY);
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/notify.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- notify.h 18 Oct 2005 11:41:53 -0000 1.5
+++ notify.h 17 Feb 2006 13:20:03 -0000 1.6
@@ -1,4 +1,4 @@
-/* $Id: notify.h,v 1.5 2005/10/18 11:41:53 andrew Exp $ */
+/* $Id: notify.h,v 1.6 2006/02/17 13:20:03 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -34,7 +34,8 @@
enum cib_errors result, crm_data_t *new_obj);
-extern void cib_diff_notify(int options, const char *op, crm_data_t *update,
- enum cib_errors result, crm_data_t *old_cib);
+extern void cib_diff_notify(
+ int options, const char *client, const char *call_id, const char *op,
+ crm_data_t *update, enum cib_errors result, crm_data_t *old_cib);
extern void cib_replace_notify(crm_data_t *update, enum cib_errors result,
crm_data_t *diff);
------------------------------
Message: 3
Date: Fri, 17 Feb 2006 06:21:11 -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:
messages.c
Log Message:
Remove unused operations
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/messages.c,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -3 -r1.144 -r1.145
--- messages.c 14 Feb 2006 11:55:07 -0000 1.144
+++ messages.c 17 Feb 2006 13:21:10 -0000 1.145
@@ -931,32 +931,6 @@
op, fsa_state2string(fsa_state));
}
- } else if(safe_str_eq(op, CRM_OP_TETIMEOUT)) {
- crm_debug("Transition cancelled: %s/%s", op, message);
- clear_bit_inplace(fsa_input_register, R_IN_TRANSITION);
- if(fsa_state == S_IDLE) {
- crm_err("Transition timed out in S_IDLE");
- schedule_pe();
-
- } else if(need_transition(fsa_state)) {
- schedule_pe();
-
- } else {
- crm_err("Filtering %s op in state %s",
- op, fsa_state2string(fsa_state));
- }
-
- } else if(safe_str_eq(op, CRM_OP_TEABORTED)) {
- crm_debug("Transition cancelled: %s/%s", op, message);
- clear_bit_inplace(fsa_input_register, R_IN_TRANSITION);
- if(need_transition(fsa_state)) {
- schedule_pe();
-
- } else {
- crm_debug("Filtering %s op in state %s",
- op, fsa_state2string(fsa_state));
- }
-
} else if(strcmp(op, CRM_OP_TECOMPLETE) == 0) {
crm_debug("Transition complete: %s/%s", op, message);
clear_bit_inplace(fsa_input_register, R_IN_TRANSITION);
------------------------------
_______________________________________________
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 73
********************************************
