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: cim by panjiam from
([email protected])
2. Linux-HA CVS: cim by panjiam from
([email protected])
3. Linux-HA CVS: cim by panjiam from
([email protected])
4. Linux-HA CVS: crm by andrew from
([email protected])
5. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Thu, 27 Apr 2006 03:20:30 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: cim by panjiam from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : panjiam
Host :
Project : linux-ha
Module : cim
Dir : linux-ha/cim/tests
Modified Files:
ResourceTest.sh
Log Message:
use different ips for different resources
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cim/tests/ResourceTest.sh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- ResourceTest.sh 27 Apr 2006 08:11:38 -0000 1.9
+++ ResourceTest.sh 27 Apr 2006 09:20:29 -0000 1.10
@@ -275,7 +275,7 @@
SUB_RESOURCE_ID=sub_resource_1
SUB_ATTRIBUTE_ID=${SUB_RESOURCE_ID}_ip
create_primitive_resource "IPaddr" "$SUB_RESOURCE_ID"
-create_attribute $SUB_RESOURCE_ID $SUB_ATTRIBUTE_ID "ip" "127.0.0.111"
+create_attribute $SUB_RESOURCE_ID $SUB_ATTRIBUTE_ID "ip" "127.0.0.200"
create_resource_group $GROUP_ID
group_add_resource $GROUP_ID $SUB_RESOURCE_ID
cib_add_resource $GROUP_ID
@@ -289,7 +289,7 @@
SUB_ATTRIBUTE_ID2=${SUB_RESOURCE_ID2}_ip
create_primitive_resource "IPaddr" $SUB_RESOURCE_ID2
-create_attribute $SUB_RESOURCE_ID2 $SUB_ATTRIBUTE_ID2 "ip" "127.0.0.112"
+create_attribute $SUB_RESOURCE_ID2 $SUB_ATTRIBUTE_ID2 "ip" "127.0.0.201"
group_add_resource $GROUP_ID $SUB_RESOURCE_ID2
wait_cib_updated
resource_query $GROUP_ID
------------------------------
Message: 2
Date: Thu, 27 Apr 2006 03:21:24 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: cim by panjiam from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : panjiam
Host :
Project : linux-ha
Module : cim
Dir : linux-ha/cim
Modified Files:
mof_map.c
Log Message:
removed unused properties
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cim/mof_map.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- mof_map.c 27 Apr 2006 06:56:04 -0000 1.3
+++ mof_map.c 27 Apr 2006 09:21:23 -0000 1.4
@@ -121,9 +121,7 @@
{"id", "Id", CMPI_chars},
{"from", "From", CMPI_chars},
{"type", "OrderType", CMPI_chars},
- {"", "Action", CMPI_chars},
{"to", "To", CMPI_chars},
- {"", "Symmetrical", CMPI_chars}
};
static const map_entry_t HA_COLOCATION_CONSTRAINT_entry [] = {
------------------------------
Message: 3
Date: Thu, 27 Apr 2006 03:21:24 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: cim by panjiam from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : panjiam
Host :
Project : linux-ha
Module : cim
Dir : linux-ha/cim/mof
Modified Files:
LinuxHA.mof
Log Message:
removed unused properties
------------------------------
Message: 4
Date: Thu, 27 Apr 2006 05:27:48 -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/tengine
Modified Files:
events.c
Log Message:
More notify stuff
- we need to the started/stopped/promoted/demoted actions run before we
can do the notify, so they need to have priority INFINITY too
- we also need to change the "skip" condition to be < rather than <=
when checking priorities
------------------------------
Message: 5
Date: Thu, 27 Apr 2006 05:27:48 -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:
incarnation.c
Log Message:
More notify stuff
- we need to the started/stopped/promoted/demoted actions run before we
can do the notify, so they need to have priority INFINITY too
- we also need to change the "skip" condition to be < rather than <=
when checking priorities
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/incarnation.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -3 -r1.79 -r1.80
--- incarnation.c 10 Apr 2006 07:45:03 -0000 1.79
+++ incarnation.c 27 Apr 2006 11:27:48 -0000 1.80
@@ -1,4 +1,4 @@
-/* $Id: incarnation.c,v 1.79 2006/04/10 07:45:03 andrew Exp $ */
+/* $Id: incarnation.c,v 1.80 2006/04/27 11:27:48 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -491,6 +491,7 @@
action->pseudo = TRUE;
action_complete->pseudo = TRUE;
+ action_complete->priority = INFINITY;
child_starting_constraints(clone_data, pe_ordering_optional,
NULL, last_start_rsc, data_set);
@@ -506,6 +507,7 @@
action->pseudo = TRUE;
action_complete->pseudo = TRUE;
+ action_complete->priority = INFINITY;
child_stopping_constraints(clone_data, pe_ordering_optional,
NULL, last_stop_rsc, data_set);
@@ -548,6 +550,7 @@
notify = custom_action(clone_data->self, notify_key,
CRMD_ACTION_NOTIFY, NULL,
action->optional, TRUE, data_set);
+
add_hash_param(notify->extra, "notify_type", "pre");
add_hash_param(notify->extra, "notify_operation", action->task);
if(clone_data->notify_confirm) {
------------------------------
_______________________________________________
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 143
*********************************************
