Send Linux-ha-cvs mailing list submissions to
linux-ha-cvs@lists.linux-ha.org
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
(linux-ha-cvs@lists.linux-ha.org)
2. Linux-HA CVS: lib by andrew from
(linux-ha-cvs@lists.linux-ha.org)
3. Linux-HA CVS: crm by andrew from
(linux-ha-cvs@lists.linux-ha.org)
4. Linux-HA CVS: crm by andrew from
(linux-ha-cvs@lists.linux-ha.org)
----------------------------------------------------------------------
Message: 1
Date: Tue, 18 Jul 2006 00:14:20 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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:
main.c
Log Message:
CIB Stats logging
--
crm/cib/main.c | 4 ++--
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/main.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -3 -r1.55 -r1.56
--- main.c 9 Jul 2006 09:54:09 -0000 1.55
+++ main.c 18 Jul 2006 06:14:18 -0000 1.56
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.55 2006/07/09 09:54:09 andrew Exp $ */
+/* $Id: main.c,v 1.56 2006/07/18 06:14:18 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -180,8 +180,8 @@
crm_save_mem_stats(__PRETTY_FUNCTION__, &saved_stats);
crm_diff_mem_stats(LOG_ERR, LOG_ERR, __PRETTY_FUNCTION__, NULL,
crm_running_stats);
*crm_running_stats = saved_stats;
- crm_info("Total alloc's %ld for %ld bytes",
- crm_running_stats->numalloc, crm_running_stats->nbytes_alloc);
+ crm_debug_2("Total alloc's %ld for %ld bytes",
+ crm_running_stats->numalloc,
crm_running_stats->nbytes_alloc);
if(cib_stat_interval_ms == 0) {
cib_stat_interval_ms = crm_get_msec(cib_stat_interval);
------------------------------
Message: 2
Date: Tue, 18 Jul 2006 00:14:44 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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/pengine
Modified Files:
unpack.c
Log Message:
Processing of pending probes.
Pending probes should not be treated as if:
a) the resource is running
b) we know the resource's state
--
lib/crm/pengine/unpack.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/pengine/unpack.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- unpack.c 23 Jun 2006 10:29:16 -0000 1.11
+++ unpack.c 18 Jul 2006 06:14:44 -0000 1.12
@@ -1,4 +1,4 @@
-/* $Id: unpack.c,v 1.11 2006/06/23 10:29:16 andrew Exp $ */
+/* $Id: unpack.c,v 1.12 2006/07/18 06:14:44 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -714,9 +714,12 @@
rsc->id, role2text(rsc->role),
node->details->uname);
- rsc->known_on = g_list_append(rsc->known_on, node);
+ if(rsc->role != RSC_ROLE_UNKNOWN) {
+ rsc->known_on = g_list_append(rsc->known_on, node);
+ }
- if(rsc->role != RSC_ROLE_STOPPED) {
+ if(rsc->role != RSC_ROLE_STOPPED
+ && rsc->role != RSC_ROLE_UNKNOWN) {
if(on_fail != action_fail_ignore) {
rsc->failed = TRUE;
crm_debug_2("Force stop");
@@ -896,7 +899,7 @@
saved_role = rsc->role;
on_fail = action_fail_ignore;
- rsc->role = RSC_ROLE_STOPPED;
+ rsc->role = RSC_ROLE_UNKNOWN;
sorted_op_list = g_list_sort(op_list, sort_op_by_callid);
slist_iter(
------------------------------
Message: 3
Date: Tue, 18 Jul 2006 00:15:11 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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:
messages.c
Log Message:
Detect more cases where the <nodes> section needs to be refreshed
--
crm/cib/messages.c | 6 ++++++
1 files changed, 6 insertions(+)
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/messages.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -3 -r1.87 -r1.88
--- messages.c 7 Jul 2006 20:43:33 -0000 1.87
+++ messages.c 18 Jul 2006 06:15:11 -0000 1.88
@@ -1,4 +1,4 @@
-/* $Id: messages.c,v 1.87 2006/07/07 20:43:33 andrew Exp $ */
+/* $Id: messages.c,v 1.88 2006/07/18 06:15:11 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -570,6 +570,12 @@
} else if(safe_str_eq(section, XML_CIB_TAG_STATUS)) {
send_notify = TRUE;
+
+ } else if(safe_str_eq(tag, XML_CIB_TAG_STATUS)) {
+ send_notify = TRUE;
+
+ } else if(safe_str_eq(tag, XML_CIB_TAG_NODES)) {
+ send_notify = TRUE;
}
}
------------------------------
Message: 4
Date: Tue, 18 Jul 2006 00:15:54 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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:
io.c
Log Message:
Extra functionality for ptest
Support reading of compressed XML files
By default, do not include optional actions and dependancies in ptest output
---
crm/admin/cibadmin.c | 2
crm/admin/crm_mon.c | 7 +
crm/admin/crm_resource.c | 7 +
crm/admin/crm_verify.c | 2
crm/admin/xml_diff.c | 4
crm/cib/io.c | 2
crm/pengine/ptest.c | 33 +++--
crm/pengine/testcases/1360.dot | 20 ---
crm/pengine/testcases/594.dot | 31 -----
crm/pengine/testcases/662.dot | 59 ---------
crm/pengine/testcases/696.dot | 26 ----
crm/pengine/testcases/726.dot | 15 --
crm/pengine/testcases/735.dot | 19 ---
crm/pengine/testcases/764.dot | 43 -------
crm/pengine/testcases/797.dot | 25 ----
crm/pengine/testcases/829.dot | 58 ---------
crm/pengine/testcases/994.dot | 26 ----
crm/pengine/testcases/group1.dot | 5
crm/pengine/testcases/group10.dot | 70 -----------
crm/pengine/testcases/group11.dot | 7 -
crm/pengine/testcases/group13.dot | 16 --
crm/pengine/testcases/group2.dot | 5
crm/pengine/testcases/group3.dot | 11 -
crm/pengine/testcases/group4.dot | 38 ------
crm/pengine/testcases/group7.dot | 11 -
crm/pengine/testcases/group8.dot | 14 --
crm/pengine/testcases/group9.dot | 15 --
crm/pengine/testcases/inc0.dot | 5
crm/pengine/testcases/inc1.dot | 5
crm/pengine/testcases/inc10.dot | 107 -----------------
crm/pengine/testcases/inc2.dot | 16 --
crm/pengine/testcases/inc3.dot | 35 -----
crm/pengine/testcases/inc5.dot | 128 ---------------------
crm/pengine/testcases/inc6.dot | 111 ------------------
crm/pengine/testcases/inc7.dot | 11 -
crm/pengine/testcases/inc8.dot | 14 --
crm/pengine/testcases/inc9.dot | 34 -----
crm/pengine/testcases/interleave-0.dot | 106 -----------------
crm/pengine/testcases/interleave-1.dot | 106 -----------------
crm/pengine/testcases/interleave-2.dot | 106 -----------------
crm/pengine/testcases/interleave-3.dot | 106 -----------------
crm/pengine/testcases/managed-0.dot | 135 ----------------------
crm/pengine/testcases/managed-1.dot | 99 ----------------
crm/pengine/testcases/managed-2.dot | 19 ---
crm/pengine/testcases/master-0.dot | 15 --
crm/pengine/testcases/master-1.dot | 11 -
crm/pengine/testcases/master-10.dot | 30 -----
crm/pengine/testcases/master-2.dot | 30 -----
crm/pengine/testcases/master-3.dot | 11 -
crm/pengine/testcases/master-4.dot | 188 -------------------------------
crm/pengine/testcases/master-5.dot | 190 -------------------------------
crm/pengine/testcases/master-6.dot | 197 ---------------------------------
crm/pengine/testcases/master-7.dot | 118 -------------------
crm/pengine/testcases/master-8.dot | 102 -----------------
crm/pengine/testcases/master-9.dot | 73 ------------
crm/pengine/testcases/multi1.dot | 3
crm/pengine/testcases/notify-0.dot | 18 ---
crm/pengine/testcases/notify-1.dot | 44 -------
crm/pengine/testcases/notify-2.dot | 44 -------
crm/pengine/testcases/notify-3.dot | 23 ---
crm/pengine/testcases/order5.dot | 24 ----
crm/pengine/testcases/order6.dot | 18 ---
crm/pengine/testcases/order7.dot | 5
crm/pengine/testcases/orphan-0.dot | 24 ----
crm/pengine/testcases/orphan-1.dot | 26 ----
crm/pengine/testcases/params-0.dot | 30 -----
crm/pengine/testcases/params-1.dot | 24 ----
crm/pengine/testcases/probe-0.dot | 105 -----------------
crm/pengine/testcases/probe-1.dot | 2
crm/pengine/testcases/quorum-1.dot | 4
crm/pengine/testcases/quorum-2.dot | 6 -
crm/pengine/testcases/quorum-3.dot | 5
crm/pengine/testcases/quorum-5.dot | 5
crm/pengine/testcases/quorum-6.dot | 5
crm/pengine/testcases/rec-node-11.dot | 8 -
crm/pengine/testcases/rec-node-12.dot | 5
crm/pengine/testcases/rec-node-13.dot | 177 -----------------------------
crm/pengine/testcases/rec-node-2.dot | 10 -
crm/pengine/testcases/rec-node-8.dot | 2
crm/pengine/testcases/rec-node-9.dot | 4
crm/pengine/testcases/rec-rsc-0.dot | 3
crm/pengine/testcases/rec-rsc-2.dot | 1
crm/pengine/testcases/rec-rsc-4.dot | 2
crm/pengine/testcases/rec-rsc-6.dot | 3
crm/pengine/testcases/rec-rsc-7.dot | 3
crm/pengine/testcases/rec-rsc-8.dot | 3
crm/pengine/testcases/rsc_dep2.dot | 8 -
crm/pengine/testcases/rsc_dep4.dot | 4
crm/pengine/testcases/rsc_dep8.dot | 8 -
crm/pengine/testcases/simple3.dot | 2
crm/pengine/testcases/simple4.dot | 2
crm/pengine/testcases/simple7.dot | 2
crm/pengine/testcases/simple8.dot | 40 ------
crm/pengine/testcases/standby.dot | 46 -------
crm/pengine/testcases/target-0.dot | 30 -----
crm/pengine/testcases/target-1.dot | 24 ----
crm/pengine/testcases/unrunnable-1.dot | 54 ---------
crm/tengine/callbacks.c | 2
crm/tengine/ttest.c | 2
include/crm/common/xml.h | 2
lib/crm/common/xml.c | 89 +++++++++++---
101 files changed, 109 insertions(+), 3521 deletions(-)
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/io.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -3 -r1.80 -r1.81
--- io.c 7 Jul 2006 20:54:42 -0000 1.80
+++ io.c 18 Jul 2006 06:15:54 -0000 1.81
@@ -1,4 +1,4 @@
-/* $Id: io.c,v 1.80 2006/07/07 20:54:42 andrew Exp $ */
+/* $Id: io.c,v 1.81 2006/07/18 06:15:54 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -184,7 +184,7 @@
if (s_res == 0) {
cib_file = fopen(filename, "r");
crm_debug_2("Reading cluster configuration from: %s", filename);
- root = file2xml(cib_file);
+ root = file2xml(cib_file, FALSE);
fclose(cib_file);
if(validate_cib_digest(root) == FALSE) {
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
Linux-ha-cvs@lists.linux-ha.org
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 32, Issue 50
********************************************
