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: include by andrew from
([email protected])
2. Linux-HA CVS: lib by andrew from
([email protected])
3. Linux-HA CVS: lib by andrew from
([email protected])
4. Linux-HA CVS: lib by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Tue, 14 Feb 2006 05:10:30 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: include by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : include
Dir : linux-ha/include/crm
Modified Files:
Makefile.am
Log Message:
Add new files to makefiles
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/include/crm/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Makefile.am 17 Aug 2004 09:44:25 -0000 1.3
+++ Makefile.am 14 Feb 2006 12:10:30 -0000 1.4
@@ -19,6 +19,6 @@
includedir=$(base_includedir)/heartbeat
-include_HEADERS = crm.h cib.h msg_xml.h
+include_HEADERS = crm.h cib.h msg_xml.h transition.h
SUBDIRS = common
------------------------------
Message: 2
Date: Tue, 14 Feb 2006 05:10:31 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/crm
Modified Files:
Makefile.am
Log Message:
Add new files to makefiles
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Makefile.am 9 May 2005 15:04:49 -0000 1.3
+++ Makefile.am 14 Feb 2006 12:10:30 -0000 1.4
@@ -18,5 +18,5 @@
MAINTAINERCLEANFILES = Makefile.in
## Subdirectories...
-SUBDIRS = common cib
-DIST_SUBDIRS = common cib
+SUBDIRS = common cib transition
+DIST_SUBDIRS = common cib transition
------------------------------
Message: 3
Date: Tue, 14 Feb 2006 05:11:23 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/crm/cib
Modified Files:
cib_client.c
Log Message:
Remove the fragment creation code - the CIB doesnt require it since 2.0.3
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/cib/cib_client.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -3 -r1.49 -r1.50
--- cib_client.c 3 Feb 2006 08:29:22 -0000 1.49
+++ cib_client.c 14 Feb 2006 12:11:23 -0000 1.50
@@ -593,6 +593,9 @@
int
num_cib_op_callbacks(void)
{
+ if(cib_op_callback_table == NULL) {
+ return 0;
+ }
return g_hash_table_size(cib_op_callback_table);
}
@@ -1252,17 +1255,12 @@
return value;
}
-#define USE_PESKY_FRAGMENTS 1
-
crm_data_t*
create_cib_fragment_adv(
crm_data_t *update, const char *update_section, const char *source)
{
crm_data_t *cib = NULL;
gboolean whole_cib = FALSE;
-#if USE_PESKY_FRAGMENTS
- crm_data_t *fragment = create_xml_node(NULL, XML_TAG_FRAGMENT);
-#endif
crm_data_t *object_root = NULL;
const char *update_name = NULL;
@@ -1286,49 +1284,26 @@
whole_cib = TRUE;
}
-#if USE_PESKY_FRAGMENTS
- crm_xml_add(fragment, XML_ATTR_SECTION, update_section);
-#endif
-
if(whole_cib == FALSE) {
cib = createEmptyCib();
crm_xml_add(cib, "debug_source", source);
object_root = get_object_root(update_section, cib);
add_node_copy(object_root, update);
-#if USE_PESKY_FRAGMENTS
- add_node_copy(fragment, cib);
- free_xml(cib);
- cib = find_xml_node(fragment, XML_TAG_CIB, TRUE);
-#endif
+
} else {
-#if USE_PESKY_FRAGMENTS
- add_node_copy(fragment, update);
- cib = find_xml_node(fragment, XML_TAG_CIB, TRUE);
-#else
+ cib = copy_xml(update);
crm_xml_add(cib, "debug_source", source);
-#endif
}
crm_debug_3("Verifying created fragment");
if(verifyCibXml(cib) == FALSE) {
crm_err("Fragment creation failed");
-#if USE_PESKY_FRAGMENTS
- crm_log_xml_err(update, "[src]");
- crm_log_xml_err(fragment, "[created]");
- free_xml(fragment);
- fragment = NULL;
-#else
crm_log_xml_err(cib, "[src]");
free_xml(cib);
cib = NULL;
-#endif
}
-#if USE_PESKY_FRAGMENTS
- return fragment;
-#else
return cib;
-#endif
}
/*
------------------------------
Message: 4
Date: Tue, 14 Feb 2006 05:12:52 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/crm/common
Modified Files:
ipc.c
Log Message:
Cleanup
- common check for IPC channel queue length
- dont crash if the IPC channel is NULL
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/ipc.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- ipc.c 3 Feb 2006 08:33:35 -0000 1.18
+++ ipc.c 14 Feb 2006 12:12:51 -0000 1.19
@@ -1,4 +1,4 @@
-/* $Id: ipc.c,v 1.18 2006/02/03 08:33:35 andrew Exp $ */
+/* $Id: ipc.c,v 1.19 2006/02/14 12:12:51 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -61,7 +61,7 @@
crm_err("No heartbeat connection specified");
all_is_good = FALSE;
- } else if(hb_conn->llc_ops->chan_is_connected(hb_conn) != HA_OK) {
+ } else if(hb_conn->llc_ops->chan_is_connected(hb_conn) == FALSE) {
crm_err("Not connected to Heartbeat");
all_is_good = FALSE;
@@ -72,32 +72,44 @@
} else if(node != NULL) {
if(hb_conn->llc_ops->send_ordered_nodemsg(
hb_conn, msg, node) != HA_OK) {
- IPC_Channel *ipc = hb_conn->llc_ops->ipcchan(hb_conn);
all_is_good = FALSE;
crm_err("Send failed");
- CRM_DEV_ASSERT(ipc->send_queue->current_qlen <
ipc->send_queue->max_qlen);
+
} else {
crm_debug_2("Message sent...");
}
+
} else if(force_ordered) {
if(hb_conn->llc_ops->send_ordered_clustermsg(hb_conn, msg) !=
HA_OK) {
- IPC_Channel *ipc = hb_conn->llc_ops->ipcchan(hb_conn);
all_is_good = FALSE;
crm_err("Broadcast Send failed");
- CRM_DEV_ASSERT(ipc->send_queue->current_qlen <
ipc->send_queue->max_qlen);
} else {
crm_debug_2("Broadcast message sent...");
}
} else {
if(hb_conn->llc_ops->sendclustermsg(hb_conn, msg) != HA_OK) {
- IPC_Channel *ipc = hb_conn->llc_ops->ipcchan(hb_conn);
all_is_good = FALSE;
crm_err("Broadcast Send failed");
- CRM_DEV_ASSERT(ipc->send_queue->current_qlen <
ipc->send_queue->max_qlen);
+
} else {
crm_debug_2("Broadcast message sent...");
}
}
+
+ if(all_is_good == FALSE && hb_conn != NULL) {
+ IPC_Channel *ipc = NULL;
+ IPC_Queue *send_q = NULL;
+
+ if(hb_conn->llc_ops->chan_is_connected(hb_conn) != HA_OK) {
+ ipc = hb_conn->llc_ops->ipcchan(hb_conn);
+ }
+ if(ipc != NULL) {
+ send_q = ipc->send_queue;
+ }
+ if(send_q != NULL) {
+ CRM_DEV_ASSERT(send_q->current_qlen < send_q->max_qlen);
+ }
+ }
crm_log_message_adv(all_is_good?LOG_MSG:LOG_WARNING,"HA[outbound]",msg);
return all_is_good;
------------------------------
_______________________________________________
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 60
********************************************
