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: crm by andrew from
([email protected])
3. Linux-HA CVS: crm by andrew from
([email protected])
4. Linux-HA CVS: lib by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Mon, 8 May 2006 06:01:04 -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_resource.c
Log Message:
If we're clearing the status of a resource that exists in <resources>
then we need to arrange for a new transition... the simplest way to
achieve that is to make a CIB update.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/crm_resource.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- crm_resource.c 8 May 2006 07:42:17 -0000 1.25
+++ crm_resource.c 8 May 2006 12:01:04 -0000 1.26
@@ -1,4 +1,4 @@
-/* $Id: crm_resource.c,v 1.25 2006/05/08 07:42:17 andrew Exp $ */
+/* $Id: crm_resource.c,v 1.26 2006/05/08 12:01:04 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -773,14 +773,22 @@
} else if(rsc_cmd == 'C') {
resource_t *rsc = pe_find_resource(data_set.resources, rsc_id);
+
+ delete_lrm_rsc(crmd_channel, host_uname, rsc?rsc->id:rsc_id,
rsc?rsc->long_name:NULL);
+
+ sleep(5);
+ refresh_lrm(crmd_channel, host_uname);
+
if(rsc != NULL) {
- delete_lrm_rsc(crmd_channel, host_uname, rsc->id,
rsc->long_name);
- sleep(10);
- refresh_lrm(crmd_channel, host_uname);
- } else {
- delete_lrm_rsc(crmd_channel, host_uname, rsc_id, NULL);
- sleep(10);
- refresh_lrm(crmd_channel, host_uname);
+ char *now_s = NULL;
+ time_t now = time(NULL);
+
+ /* force the TE to start a transition */
+ sleep(5); /* wait for the refresh */
+ now_s = crm_itoa(now);
+ update_attr(cib_conn, cib_sync_call,
+ NULL, NULL, NULL, NULL, "last-lrm-refresh",
now_s);
+ crm_free(now_s);
}
} else {
------------------------------
Message: 2
Date: Mon, 8 May 2006 06:09:46 -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_mon.c
Log Message:
Only if the resource is orphan'd AND stopped do we ignore it
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/crm_mon.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- crm_mon.c 27 Mar 2006 14:53:40 -0000 1.20
+++ crm_mon.c 8 May 2006 12:09:46 -0000 1.21
@@ -1,4 +1,4 @@
-/* $Id: crm_mon.c,v 1.20 2006/03/27 14:53:40 andrew Exp $ */
+/* $Id: crm_mon.c,v 1.21 2006/05/08 12:09:46 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -433,7 +433,7 @@
slist_iter(rsc, resource_t, data_set.resources, lpc2,
gboolean is_active = rsc->fns->active(rsc, TRUE);
gboolean partially_active = rsc->fns->active(rsc,
FALSE);
- if(rsc->orphan) {
+ if(rsc->orphan && is_active == FALSE) {
continue;
} else if(group_by_node == FALSE) {
------------------------------
Message: 3
Date: Mon, 8 May 2006 06:12:42 -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_resource.c
Log Message:
Keep dead resources out of the crm_resource -L results
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/crm_resource.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- crm_resource.c 8 May 2006 12:01:04 -0000 1.26
+++ crm_resource.c 8 May 2006 12:12:42 -0000 1.27
@@ -1,4 +1,4 @@
-/* $Id: crm_resource.c,v 1.26 2006/05/08 12:01:04 andrew Exp $ */
+/* $Id: crm_resource.c,v 1.27 2006/05/08 12:12:42 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -109,6 +109,9 @@
slist_iter(
rsc, resource_t, data_set->resources, lpc,
+ if(rsc->orphan && rsc->fns->active(rsc, TRUE) == FALSE) {
+ continue;
+ }
rsc->fns->print(
rsc, NULL, pe_print_printf|pe_print_rsconly, stdout);
found++;
------------------------------
Message: 4
Date: Mon, 8 May 2006 08:39:52 -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:
utils.c
Log Message:
Only produce core files for non-fatal asserts if we have debug turned on
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/utils.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -3 -r1.49 -r1.50
--- utils.c 8 May 2006 07:42:19 -0000 1.49
+++ utils.c 8 May 2006 14:39:52 -0000 1.50
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.49 2006/05/08 07:42:19 andrew Exp $ */
+/* $Id: utils.c,v 1.50 2006/05/08 14:39:52 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -1184,6 +1184,10 @@
"Triggered %sfatal assert at %s:%d : %s",
do_fork?"non-":"", file, line, assert_condition);
+ if(do_fork && crm_log_level < LOG_DEBUG) {
+ return;
+ }
+
if(do_fork) {
pid=fork();
}
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 30, Issue 18
********************************************
