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: linux-ha by lars from
([email protected])
3. Linux-HA CVS: crm by andrew from
([email protected])
4. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
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/crmd
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/crmd/callbacks.c,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -3 -r1.112 -r1.113
--- callbacks.c 4 Apr 2006 17:10:42 -0000 1.112
+++ callbacks.c 5 Apr 2006 13:23:35 -0000 1.113
@@ -419,6 +419,31 @@
trigger_fsa(fsa_source);
}
+static void
+crmd_ipc_connection_destroy(gpointer user_data)
+{
+ crmd_client_t *client = user_data;
+
+ if(client == NULL) {
+ crm_debug_4("No client to delete");
+ return;
+ }
+
+ if(client->client_source != NULL) {
+ crm_debug_4("Deleting %s (%p) from mainloop",
+ client->uuid, client->client_source);
+ G_main_del_IPC_Channel(client->client_source);
+ client->client_source = NULL;
+ }
+
+ crm_debug_3("Freeing %s client", client->uuid);
+ crm_free(client->table_key);
+ crm_free(client->sub_sys);
+ crm_free(client->uuid);
+ crm_free(client);
+
+ return;
+}
gboolean
crmd_client_connect(IPC_Channel *client_channel, gpointer user_data)
@@ -451,7 +476,7 @@
G_main_add_IPC_Channel(
G_PRIORITY_LOW, client_channel,
FALSE, crmd_ipc_msg_callback,
- blank_client, default_ipc_connection_destroy);
+ blank_client, crmd_ipc_connection_destroy);
}
return TRUE;
------------------------------
Message: 2
Date: Wed, 5 Apr 2006 07:30:54 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by lars from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : lars
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
configure.in
Log Message:
Default certain programs searched for during configure time in case they
are not found then, instead of silently substituting empty strings in
resource agents etc.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/configure.in,v
retrieving revision 1.499
retrieving revision 1.500
diff -u -3 -r1.499 -r1.500
--- configure.in 4 Apr 2006 13:20:54 -0000 1.499
+++ configure.in 5 Apr 2006 13:30:53 -0000 1.500
@@ -10,7 +10,7 @@
AC_INIT(heartbeat.spec.in)
AC_CONFIG_AUX_DIR(.)
-AC_REVISION($Revision: 1.499 $) dnl cvs revision
+AC_REVISION($Revision: 1.500 $) dnl cvs revision
AC_CANONICAL_HOST
@@ -336,27 +336,27 @@
AC_PATH_PROGS(RPM, rpm)
fi
AC_DEFINE_UNQUOTED(ROUTE, "$ROUTE", path to route command)
-AC_PATH_PROGS(NETSTAT, netstat)
+AC_PATH_PROGS(NETSTAT, netstat, /sbin/netstat)
AC_DEFINE_UNQUOTED(NETSTAT, "$NETSTAT", path to the netstat command)
-AC_PATH_PROGS(PING, ping)
-AC_PATH_PROGS(IFCONFIG, ifconfig)
-AC_PATH_PROGS(SSH, ssh)
-AC_PATH_PROGS(SCP, scp)
+AC_PATH_PROGS(PING, ping, ping)
+AC_PATH_PROGS(IFCONFIG, ifconfig, /sbin/ifconfig)
+AC_PATH_PROGS(SSH, ssh, ssh)
+AC_PATH_PROGS(SCP, scp, scp)
AC_PATH_PROGS(PYTHON, python)
dnl - Determine which mail program exists. Mailx is Solaris
AC_PATH_PROGS(MAILCMD, mail, mailx)
AC_SUBST(MAILCMD)
AC_DEFINE_UNQUOTED(IFCONFIG, "$IFCONFIG", path to the ifconfig command)
-AC_PATH_PROGS(BLOCKDEV, blockdev)
-AC_PATH_PROGS(BASENAME, basename)
-AC_PATH_PROGS(FUSER, fuser)
-AC_PATH_PROGS(MOUNT, mount)
-AC_PATH_PROGS(UMOUNT, umount)
-AC_PATH_PROGS(FSCK, fsck)
-AC_PATH_PROGS(MODPROBE, modprobe)
-AC_PATH_PROGS(RAIDSTART, raidstart)
-AC_PATH_PROGS(RAIDSTOP, raidstop)
-AC_PATH_PROGS(MDADM, mdadm)
+AC_PATH_PROGS(BLOCKDEV, blockdev, /sbin/blockdev)
+AC_PATH_PROGS(BASENAME, basename, basename)
+AC_PATH_PROGS(FUSER, fuser, fuser)
+AC_PATH_PROGS(MOUNT, mount, mount)
+AC_PATH_PROGS(UMOUNT, umount, umount)
+AC_PATH_PROGS(FSCK, fsck, fsck)
+AC_PATH_PROGS(MODPROBE, modprobe, modprobe)
+AC_PATH_PROGS(RAIDSTART, raidstart, raidstart)
+AC_PATH_PROGS(RAIDSTOP, raidstop, raidstop)
+AC_PATH_PROGS(MDADM, mdadm, /sbin/mdadm)
AC_PATH_PROGS(LIBNETCONFIG, libnet-config)
AC_PATH_PROGS(GETENT, getent)
AC_PATH_PROGS(IP2UTIL, ip)
@@ -392,8 +392,8 @@
dnl The "test" program can be different from the "sh" builtin.
AC_PATH_PROGS(TEST, test)
-AC_PATH_PROGS(DRBDADM, drbdadm)
-AC_PATH_PROGS(DRBDSETUP, drbdsetup)
+AC_PATH_PROGS(DRBDADM, drbdadm, /sbin/drbdadm)
+AC_PATH_PROGS(DRBDSETUP, drbdsetup, /sbin/drbdsetup)
AC_PATH_PROGS(PKGCONFIG, pkg-config)
dnl ************************************************************************
------------------------------
Message: 3
Date: Wed, 5 Apr 2006 07:37:05 -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:
oops, make sure it compiles with compatibility turned on
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/crm_verify.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- crm_verify.c 5 Apr 2006 12:59:09 -0000 1.9
+++ crm_verify.c 5 Apr 2006 13:37:05 -0000 1.10
@@ -1,4 +1,4 @@
-/* $Id: crm_verify.c,v 1.9 2006/04/05 12:59:09 andrew Exp $ */
+/* $Id: crm_verify.c,v 1.10 2006/04/05 13:37:05 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -56,7 +56,8 @@
int
main(int argc, char **argv)
{
- crm_data_t * cib_object = NULL;
+ crm_data_t *cib_object = NULL;
+ crm_data_t *status = NULL;
int argerr = 0;
int flag;
@@ -205,8 +206,8 @@
write_xml_file(cib_object, cib_save, FALSE);
}
-#if CRM_DEPRECATED_SINCE_2_0_4
status = get_object_root(XML_CIB_TAG_STATUS, cib_object);
+#if CRM_DEPRECATED_SINCE_2_0_4
xml_child_iter_filter(status, node_state, XML_CIB_TAG_STATE,
xml_remove_prop(node_state, XML_CIB_TAG_LRM);
);
------------------------------
Message: 4
Date: Wed, 5 Apr 2006 07:41:29 -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/crmd
Modified Files:
utils.c
Log Message:
we do this in the destroy callback now
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/utils.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -3 -r1.88 -r1.89
--- utils.c 31 Mar 2006 11:50:24 -0000 1.88
+++ utils.c 5 Apr 2006 13:41:28 -0000 1.89
@@ -1310,9 +1310,7 @@
{
struct crm_subsystem_s *the_subsystem = NULL;
- CRM_DEV_ASSERT(curr_client != NULL);
- if(crm_assert_failed) { return; }
-
+ CRM_CHECK(curr_client != NULL, return);
crm_debug_2("received HUP from %s", curr_client->table_key);
if (curr_client->sub_sys == NULL) {
@@ -1347,11 +1345,6 @@
*/
g_hash_table_remove(ipc_clients, curr_client->table_key);
}
-
- crm_free(curr_client->table_key);
- crm_free(curr_client->sub_sys);
- crm_free(curr_client->uuid);
- crm_free(curr_client);
}
void update_dc(HA_Message *msg)
------------------------------
_______________________________________________
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 26
********************************************
