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: debian by horms from
([email protected])
2. Linux-HA CVS: crm by andrew from
([email protected])
3. Linux-HA CVS: lib by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Mon, 3 Jul 2006 19:22:07 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: debian by horms from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : horms
Host :
Project : linux-ha
Module : debian
Dir : linux-ha/debian
Modified Files:
Tag: STABLE_1_2
changelog control
Log Message:
Debian Packaging Update: heartbeat 1.2.4-11 release
heartbeat (1.2.4-11) unstable; urgency=low
* Remove the unneccesary Build-Depends on automake as part of
automake transition. http://wiki.debian.org/AutomakeTransition
(closes #376623)
-- Simon Horman <[EMAIL PROTECTED]> Tue, 4 Jul 2006 10:14:48 +0900
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/changelog,v
retrieving revision 1.17.2.42
retrieving revision 1.17.2.43
diff -u -3 -r1.17.2.42 -r1.17.2.43
--- changelog 30 Jun 2006 03:10:41 -0000 1.17.2.42
+++ changelog 4 Jul 2006 01:22:06 -0000 1.17.2.43
@@ -1,3 +1,11 @@
+heartbeat (1.2.4-11) unstable; urgency=low
+
+ * Remove the unneccesary Build-Depends on automake as part of
+ automake transition. http://wiki.debian.org/AutomakeTransition
+ (closes #376623)
+
+ -- Simon Horman <[EMAIL PROTECTED]> Tue, 4 Jul 2006 10:14:48 +0900
+
heartbeat (1.2.4-10) unstable; urgency=low
* Update ldirectordy from 1.77.2.32 to 1.77.2.45 (1.135)
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/control,v
retrieving revision 1.17.2.28
retrieving revision 1.17.2.29
diff -u -3 -r1.17.2.28 -r1.17.2.29
--- control 19 May 2006 02:00:26 -0000 1.17.2.28
+++ control 4 Jul 2006 01:22:06 -0000 1.17.2.29
@@ -2,7 +2,7 @@
Section: admin
Priority: optional
Maintainer: Simon Horman <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0.0), libsnmp9-dev, libglib1.2-dev, perl,
net-tools, netkit-ping | iputils-ping, python, psmisc, modutils, libnet1-dev,
iproute, libssl-dev, libtool, automake, libcurl3-dev, libxml2-dev, bison, flex,
libsensors-dev, uuid-dev, openssh-client
+Build-Depends: debhelper (>= 4.0.0), libsnmp9-dev, libglib1.2-dev, perl,
net-tools, netkit-ping | iputils-ping, python, psmisc, modutils, libnet1-dev,
iproute, libssl-dev, libtool, libcurl3-dev, libxml2-dev, bison, flex,
libsensors-dev, uuid-dev, openssh-client
Standards-Version: 3.7.2
Package: ldirectord
------------------------------
Message: 2
Date: Mon, 3 Jul 2006 23:58:30 -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:
control.c lrm.c
Log Message:
OSDL #1356: reordered the "are any resources active" check to happen after
we've confirmed all resource actions are complete
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/control.c,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -3 -r1.130 -r1.131
--- control.c 23 Jun 2006 10:45:40 -0000 1.130
+++ control.c 4 Jul 2006 05:58:29 -0000 1.131
@@ -404,6 +404,12 @@
}
extern GHashTable *shutdown_ops;
+static void
+ghash_print_pending(gpointer key, gpointer value, gpointer user_data)
+{
+ const char *action = key;
+ crm_debug("Pending action: %s", action);
+}
/* A_STOP */
enum crmd_fsa_input
@@ -415,21 +421,24 @@
{
crm_data_t *node_state = NULL;
crm_debug_2("Stopping all remaining local resources");
- if(is_set(fsa_input_register, R_LRM_CONNECTED)) {
- stop_all_resources();
-
- } else {
- crm_err("Exiting with no LRM connection..."
- " resources may be active!");
- }
if(g_hash_table_size(shutdown_ops) > 0) {
crm_info("Waiting on %d lrm operations to complete",
g_hash_table_size(shutdown_ops));
+ g_hash_table_foreach(
+ shutdown_ops, ghash_print_pending, NULL);
crmd_fsa_stall(NULL);
return I_NULL;
}
+ if(is_set(fsa_input_register, R_LRM_CONNECTED)) {
+ stop_all_resources();
+
+ } else {
+ crm_err("Exiting with no LRM connection..."
+ " resources may be active!");
+ }
+
#if 0
crm_debug("Sending \"stopped\" update to CIB");
node_state = create_node_state(
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/lrm.c,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -3 -r1.198 -r1.199
--- lrm.c 23 Jun 2006 10:45:40 -0000 1.198
+++ lrm.c 4 Jul 2006 05:58:29 -0000 1.199
@@ -45,8 +45,6 @@
#include <crm/dmalloc_wrapper.h>
char *make_stop_id(const char *rsc, int call_id);
-void ghash_print_pending(gpointer key, gpointer value, gpointer user_data);
-
gboolean stop_all_resources(void);
gboolean resource_stopped(gpointer key, gpointer value, gpointer user_data);
@@ -280,6 +278,13 @@
return I_NULL;
}
+static void
+ghash_print_pending(gpointer key, gpointer value, gpointer user_data)
+{
+ const char *action = key;
+ crm_err("Pending action: %s", action);
+}
+
gboolean
stop_all_resources(void)
{
@@ -294,6 +299,13 @@
return TRUE;
}
+ CRM_CHECK(g_hash_table_size(shutdown_ops) == 0,
+ crm_err("%d pending LRM operations at shutdown",
+ g_hash_table_size(shutdown_ops));
+ g_hash_table_foreach(
+ shutdown_ops, ghash_print_pending, NULL);
+ );
+
lrm_list = fsa_lrm_conn->lrm_ops->get_all_rscs(fsa_lrm_conn);
slist_iter(
rsc_id, char, lrm_list, lpc,
@@ -302,22 +314,11 @@
crm_err("Resource %s was active at shutdown."
" You may ignore this error if it is
unmanaged.",
rsc_id);
-/* do_lrm_rsc_op(NULL, rsc_id, CRMD_ACTION_STOP, NULL,
NULL); */
}
);
set_bit_inplace(fsa_input_register, R_SENT_RSC_STOP);
-
- if(g_hash_table_size(shutdown_ops) == 0) {
- register_fsa_input(C_FSA_INTERNAL, I_TERMINATE, NULL);
-
- } else {
- crm_info("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);
- }
+ register_fsa_input(C_FSA_INTERNAL, I_TERMINATE, NULL);
return TRUE;
}
@@ -1554,20 +1555,6 @@
}
crm_free(op_id);
}
-
- if(is_set(fsa_input_register, R_SENT_RSC_STOP)) {
- if(g_hash_table_size(shutdown_ops) == 0) {
- register_fsa_input(C_FSA_INTERNAL, I_TERMINATE, NULL);
-
- } else {
- 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);
- }
- }
-
return TRUE;
}
@@ -1582,13 +1569,6 @@
return op_id;
}
-void
-ghash_print_pending(gpointer key, gpointer value, gpointer user_data)
-{
- const char *uname = key;
- crm_debug("Pending action: %s", uname);
-}
-
gboolean
resource_stopped(gpointer key, gpointer value, gpointer user_data)
{
------------------------------
Message: 3
Date: Tue, 4 Jul 2006 00:24:03 -0600 (MDT)
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:
xml.c
Log Message:
OSDL #1354: CRM silently ignores trailing characters in XML input
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/xml.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -3 -r1.96 -r1.97
--- xml.c 3 Jul 2006 12:00:23 -0000 1.96
+++ xml.c 4 Jul 2006 06:24:01 -0000 1.97
@@ -1,4 +1,4 @@
-/* $Id: xml.c,v 1.96 2006/07/03 12:00:23 andrew Exp $ */
+/* $Id: xml.c,v 1.97 2006/07/04 06:24:01 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -1498,6 +1498,11 @@
return NULL;
}
+ if(offset == NULL && lpc+1 < (ssize_t)strlen(input)) {
+ crm_err("Ignoring trailing characters in XML input: Parsed %d
characters of a possible %d",
+ lpc, (int)strlen(input));
+ }
+
crm_debug_4("Finished processing %s tag", tag_name);
crm_free(tag_name);
if(offset != NULL) {
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 32, Issue 6
*******************************************
