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: mgmt by zhenh from
([email protected])
2. Linux-HA CVS: crm by andrew from
([email protected])
3. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Thu, 25 May 2006 03:46:19 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: mgmt by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : mgmt
Dir : linux-ha/mgmt/client
Modified Files:
active-node.png add-resource.png cleanup-resource.png
default-resource.png down-resource.png exit.png
master-resource.png remove-resource.png slave-resource.png
standby-node.png start-resource.png stop-resource.png
up-resource.png
Log Message:
change the light green to dark green
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/client/active-node.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
Binary files /tmp/cvsyvsxpw and /tmp/cvs2lBqzS differ
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/client/add-resource.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
Binary files /tmp/cvsoJ5mqz and /tmp/cvsmQuMSY differ
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/client/cleanup-resource.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
Binary files /tmp/cvseDgMTx and /tmp/cvscVKmHV differ
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/client/default-resource.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
Binary files /tmp/cvs21ZzdB and /tmp/cvsS8tWa2 differ
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/client/down-resource.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
Binary files /tmp/cvsYQiJUB and /tmp/cvskNgtR3 differ
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/client/exit.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
Binary files /tmp/cvsUvq0uA and /tmp/cvsCexTK0 differ
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/client/master-resource.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
Binary files /tmp/cvsUwkUwD and /tmp/cvs2Z5C66 differ
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/client/remove-resource.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
Binary files /tmp/cvsaohplE and /tmp/cvs2pyTA8 differ
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/client/slave-resource.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
Binary files /tmp/cvs49yGYC and /tmp/cvs8Mp0H5 differ
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/client/standby-node.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
Binary files /tmp/cvsE569DU and /tmp/cvskXcdmF differ
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/client/start-resource.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
Binary files /tmp/cvsDu3M9S and /tmp/cvsC7DpmC differ
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/client/stop-resource.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
Binary files /tmp/cvsBEmRmW and /tmp/cvsku91CI differ
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/client/up-resource.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
Binary files /tmp/cvsrwY3kX and /tmp/cvskIBXqK differ
------------------------------
Message: 2
Date: Thu, 25 May 2006 04:26:49 -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/pengine
Modified Files:
graph.c
Log Message:
Slightly more elegant version of the previous patch
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/graph.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -3 -r1.93 -r1.94
--- graph.c 24 May 2006 20:49:28 -0000 1.93
+++ graph.c 25 May 2006 10:26:49 -0000 1.94
@@ -1,4 +1,4 @@
-/* $Id: graph.c,v 1.93 2006/05/24 20:49:28 andrew Exp $ */
+/* $Id: graph.c,v 1.94 2006/05/25 10:26:49 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -251,6 +251,7 @@
action, action_t, action_list, lpc2,
if(node->details->online == FALSE
|| rsc->failed) {
+ resource_t *parent = NULL;
crm_info("Stop of failed resource %s is"
" implict after %s is fenced",
rsc->id, node->details->uname);
@@ -260,6 +261,7 @@
action->pseudo = TRUE;
action->runnable = TRUE;
if(action->optional) {
+ /* does this case ever happen?
*/
custom_action_order(
NULL,
crm_strdup(CRM_OP_FENCE),stonith_op,
rsc, start_key(rsc),
NULL,
@@ -270,9 +272,18 @@
rsc, NULL, action,
pe_ordering_manditory,
data_set);
}
- if(action->rsc->parent) {
- crm_info("Recalling actions for
%s", action->rsc->parent->id);
-
action->rsc->parent->fns->create_actions(action->rsc->parent, data_set);
+
+ /* find the top-most resource */
+ parent = rsc->parent;
+ while(parent != NULL && parent->parent
!= NULL) {
+ parent = parent->parent;
+ }
+
+ if(parent) {
+ crm_info("Re-creating actions
for %s",
+ parent->id);
+ parent->fns->create_actions(
+ parent, data_set);
}
} else {
------------------------------
Message: 3
Date: Thu, 25 May 2006 05:49:54 -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/pengine
Modified Files:
native.c
Log Message:
The final piece for Novell #178488
- Filter notifications for events on offline nodes
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/native.c,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -3 -r1.140 -r1.141
--- native.c 24 May 2006 16:38:24 -0000 1.140
+++ native.c 25 May 2006 11:49:54 -0000 1.141
@@ -1,4 +1,4 @@
-/* $Id: native.c,v 1.140 2006/05/24 16:38:24 andrew Exp $ */
+/* $Id: native.c,v 1.141 2006/05/25 11:49:54 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -1761,6 +1761,11 @@
CRM_CHECK(node != NULL, return NULL);
+ if(node->details->online == FALSE) {
+ crm_err("Skipping notification for %s", rsc->id);
+ return NULL;
+ }
+
value = g_hash_table_lookup(op->meta, "notify_type");
task = g_hash_table_lookup(op->meta, "notify_operation");
------------------------------
_______________________________________________
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 80
********************************************
