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 zhenh from ([email protected])
2. Linux-HA CVS: crm by andrew from
([email protected])
3. Linux-HA CVS: crm by lars from ([email protected])
4. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Wed, 5 Apr 2006 04:06:24 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm
Modified Files:
Makefile.am
Log Message:
sometime the build dir is not the source dir, so we need indicate the source dir
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- Makefile.am 4 Apr 2006 14:23:21 -0000 1.15
+++ Makefile.am 5 Apr 2006 10:06:23 -0000 1.16
@@ -29,7 +29,7 @@
dtd_SCRIPTS = crm.dtd
crm.dtd: crm-1.0.dtd
- cp crm-1.0.dtd crm.dtd
+ cp $(top_srcdir)/crm/crm-1.0.dtd crm.dtd
install-exec-local:
$(mkinstalldirs) $(DESTDIR)/$(crm_varlibdir)
------------------------------
Message: 2
Date: Wed, 5 Apr 2006 06:59:09 -0600 (MDT)
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/admin
Modified Files:
crm_verify.c
Log Message:
typo
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/crm_verify.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- crm_verify.c 5 Apr 2006 09:59:35 -0000 1.8
+++ crm_verify.c 5 Apr 2006 12:59:09 -0000 1.9
@@ -1,4 +1,4 @@
-/* $Id: crm_verify.c,v 1.8 2006/04/05 09:59:35 andrew Exp $ */
+/* $Id: crm_verify.c,v 1.9 2006/04/05 12:59:09 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -207,7 +207,7 @@
#if CRM_DEPRECATED_SINCE_2_0_4
status = get_object_root(XML_CIB_TAG_STATUS, cib_object);
- xml_child_iter(status, node_state, XML_CIB_TAG_STATE,
+ xml_child_iter_filter(status, node_state, XML_CIB_TAG_STATE,
xml_remove_prop(node_state, XML_CIB_TAG_LRM);
);
#endif
------------------------------
Message: 3
Date: Wed, 5 Apr 2006 07:14:05 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by lars from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : lars
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm/admin
Modified Files:
crm_attribute.c
Log Message:
Minor correction to the help text.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/crm_attribute.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- crm_attribute.c 27 Mar 2006 14:53:16 -0000 1.10
+++ crm_attribute.c 5 Apr 2006 13:14:05 -0000 1.11
@@ -1,4 +1,4 @@
-/* $Id: crm_attribute.c,v 1.10 2006/03/27 14:53:16 andrew Exp $ */
+/* $Id: crm_attribute.c,v 1.11 2006/04/05 13:14:05 lars Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -415,7 +415,7 @@
} else if(safe_str_eq(cmd, "crm_standby")) {
fprintf(stream, "\t--%s (-%c) <node_uuid>\t: "
"UUID of the node to change\n", "node-uuid", 'u');
- fprintf(stream, "\t--%s (-%c) <node_uuid>\t: "
+ fprintf(stream, "\t--%s (-%c) <node_uname>\t: "
"uname of the node to change\n", "node-uname", 'U');
fprintf(stream, "\t--%s (-%c) <string>\t: "
"How long the preference lasts (reboot|forever)\n"
------------------------------
Message: 4
Date: Wed, 5 Apr 2006 07:23:35 -0600 (MDT)
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
Log Message:
Fix for bz #1182
Instead of calling G_main_del_IPC_Channel() in the dispatch method,
call it in the destroy callback.
Whether this is a true fix or if it just makes a timing window smaller
is hard to tell even after reviewing the glib code in gmain.c but it
seems to make sense.
Apply the same concept to the crmd
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/callbacks.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -3 -r1.118 -r1.119
--- callbacks.c 3 Apr 2006 15:59:17 -0000 1.118
+++ callbacks.c 5 Apr 2006 13:23:34 -0000 1.119
@@ -1,4 +1,4 @@
-/* $Id: callbacks.c,v 1.118 2006/04/03 15:59:17 andrew Exp $ */
+/* $Id: callbacks.c,v 1.119 2006/04/05 13:23:34 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -244,6 +244,34 @@
gboolean cib_process_disconnect(IPC_Channel *channel, cib_client_t
*cib_client);
+static void
+cib_ipc_connection_destroy(gpointer user_data)
+{
+ cib_client_t *cib_client = user_data;
+
+ /* cib_process_disconnect */
+
+ if(cib_client == NULL) {
+ crm_debug_4("Destroying %p", user_data);
+ return;
+ }
+
+ if(cib_client->source != NULL) {
+ crm_debug_4("Deleting %s (%p) from mainloop",
+ cib_client->name, cib_client->source);
+ G_main_del_IPC_Channel(cib_client->source);
+ cib_client->source = NULL;
+ }
+
+ crm_debug_3("Destroying %s (%p)", cib_client->name, user_data);
+ crm_free(cib_client->name);
+ crm_free(cib_client->callback_id);
+ crm_free(cib_client->id);
+ crm_free(cib_client);
+ crm_debug_4("Freed the cib client");
+
+ return;
+}
static cib_client_t *
cib_client_connect_common(
@@ -288,7 +316,7 @@
if(callback != NULL) {
new_client->source = G_main_add_IPC_Channel(
G_PRIORITY_DEFAULT, channel, FALSE, callback,
- new_client, default_ipc_connection_destroy);
+ new_client, cib_ipc_connection_destroy);
}
crm_debug_3("Channel %s connected for client %s",
@@ -524,9 +552,8 @@
}
if(channel->ch_status != IPC_CONNECT) {
- keep_connection = FALSE;
crm_debug_2("Client disconnected");
- cib_process_disconnect(channel, cib_client);
+ keep_connection = cib_process_disconnect(channel, cib_client);
}
return keep_connection;
@@ -629,9 +656,8 @@
crm_debug_2("Processed %d messages", lpc);
if(channel->ch_status != IPC_CONNECT) {
- keep_channel = FALSE;
crm_debug_2("Client disconnected");
- cib_process_disconnect(channel, cib_client);
+ keep_channel = cib_process_disconnect(channel, cib_client);
}
@@ -1317,15 +1343,11 @@
gboolean
cib_process_disconnect(IPC_Channel *channel, cib_client_t *cib_client)
{
- gboolean keep_connection = TRUE;
-
if (channel == NULL) {
- keep_connection = FALSE;
CRM_DEV_ASSERT(cib_client == NULL);
} else if (cib_client == NULL) {
crm_err("No client");
- keep_connection = FALSE;
} else {
CRM_DEV_ASSERT(channel->ch_status != IPC_CONNECT);
@@ -1339,30 +1361,15 @@
crm_err("Client %s not found in the hashtable",
cib_client->name);
}
- }
-
- if(cib_client->source != NULL) {
- crm_debug_3("deleting the IPC Channel");
- G_main_del_IPC_Channel(cib_client->source);
- cib_client->source = NULL;
- }
-
- crm_free(cib_client->name);
- crm_free(cib_client->callback_id);
- crm_free(cib_client->id);
- crm_free(cib_client);
- crm_debug_3("Freed the cib client");
-
- keep_connection = FALSE;
+ }
}
if(cib_shutdown_flag && g_hash_table_size(client_list) == 0) {
crm_info("All clients disconnected...");
- CRM_DEV_ASSERT(keep_connection == FALSE);
initiate_exit();
}
- return keep_connection;
+ return FALSE;
}
gboolean
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 29, Issue 25
********************************************
