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: heartbeat by andrew from
([email protected])
3. Linux-HA CVS: include by andrew 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: Tue, 23 May 2006 01:48:15 -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:
stages.c
Log Message:
Missed a file - tweaked the order_actions() function
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/stages.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -3 -r1.95 -r1.96
--- stages.c 22 May 2006 15:30:06 -0000 1.95
+++ stages.c 23 May 2006 07:48:15 -0000 1.96
@@ -1,4 +1,4 @@
-/* $Id: stages.c,v 1.95 2006/05/22 15:30:06 andrew Exp $ */
+/* $Id: stages.c,v 1.96 2006/05/23 07:48:15 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -34,10 +34,6 @@
#include <pe_utils.h>
node_t *choose_fencer(action_t *stonith, node_t *node, GListPtr resources);
-void order_actions(action_t *lh, action_t *rh, order_constraint_t *order);
-
-
-
/*
* Unpack everything
@@ -442,7 +438,7 @@
} else {
/* fall back to action-to-action */
order_actions(
- order->lh_action, order->rh_action, order);
+ order->lh_action, order->rh_action,
order->type);
}
);
------------------------------
Message: 2
Date: Tue, 23 May 2006 01:50:07 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: heartbeat by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : heartbeat
Dir : linux-ha/heartbeat/libnet_util
Modified Files:
send_arp.c
Log Message:
Compilation on Darwin when using DarwinPorts instead of Fink
(apparently they have different versions of libnet)
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat/libnet_util/send_arp.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- send_arp.c 1 May 2006 22:57:21 -0000 1.25
+++ send_arp.c 23 May 2006 07:50:07 -0000 1.26
@@ -1,4 +1,4 @@
-/* $Id: send_arp.c,v 1.25 2006/05/01 22:57:21 msoffen Exp $ */
+/* $Id: send_arp.c,v 1.26 2006/05/23 07:50:07 andrew Exp $ */
/*
* send_arp
*
@@ -196,7 +196,11 @@
}
#if defined(HAVE_LIBNET_1_0_API)
+#ifdef ON_DARWIN
+ if ((ip = libnet_name_resolve((unsigned char*)ipaddr, 1)) == -1UL) {
+#else
if ((ip = libnet_name_resolve(ipaddr, 1)) == -1UL) {
+#endif
cl_log(LOG_ERR, "Cannot resolve IP address [%s]", ipaddr);
unlink(pidfilename);
return EXIT_FAILURE;
@@ -400,7 +404,7 @@
/* Convert ASCII Mac Address to 6 Hex Digits. */
/* Ethernet header */
- if (get_hw_addr(device, device_mac) < 0) {
+ if (get_hw_addr((char*)device, device_mac) < 0) {
cl_log(LOG_ERR, "Cannot find mac address for %s",
device);
return -1;
@@ -444,7 +448,7 @@
return -1;
}
- n = libnet_write_link_layer(l, device, buf, LIBNET_ARP_H +
LIBNET_ETH_H);
+ n = libnet_write_link_layer(l, (char*)device, buf, LIBNET_ARP_H +
LIBNET_ETH_H);
if (n == -1) {
cl_log(LOG_ERR, "libnet_build_ethernet failed:");
}
@@ -696,6 +700,10 @@
/*
* $Log: send_arp.c,v $
+ * Revision 1.26 2006/05/23 07:50:07 andrew
+ * Compilation on Darwin when using DarwinPorts instead of Fink
+ * (apparently they have different versions of libnet)
+ *
* Revision 1.25 2006/05/01 22:57:21 msoffen
* Fixed to compile with older libnet.
*
------------------------------
Message: 3
Date: Tue, 23 May 2006 01:50:50 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: include by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : include
Dir : linux-ha/include/crm
Modified Files:
crm.h
Log Message:
Some new defines (ahead of time)
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/include/crm/crm.h,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -3 -r1.96 -r1.97
--- crm.h 22 May 2006 11:03:41 -0000 1.96
+++ crm.h 23 May 2006 07:50:50 -0000 1.97
@@ -1,4 +1,4 @@
-/* $Id: crm.h,v 1.96 2006/05/22 11:03:41 andrew Exp $ */
+/* $Id: crm.h,v 1.97 2006/05/23 07:50:50 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -44,6 +44,9 @@
#define CRM_DEPRECATED_SINCE_2_0_3 0
#define CRM_DEPRECATED_SINCE_2_0_4 1
#define CRM_DEPRECATED_SINCE_2_0_5 1
+#define CRM_DEPRECATED_SINCE_2_0_6 1
+#define CRM_DEPRECATED_SINCE_2_0_7 1
+#define CRM_DEPRECATED_SINCE_2_0_8 1
#define CRM_DEPRECATED_SINCE_2_1_0 1
#define CRM_META "CRM_meta"
------------------------------
Message: 4
Date: Tue, 23 May 2006 01:51:21 -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:
Preemptivly check for NULL
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/native.c,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -3 -r1.135 -r1.136
--- native.c 23 May 2006 07:45:37 -0000 1.135
+++ native.c 23 May 2006 07:51:20 -0000 1.136
@@ -1,4 +1,4 @@
-/* $Id: native.c,v 1.135 2006/05/23 07:45:37 andrew Exp $ */
+/* $Id: native.c,v 1.136 2006/05/23 07:51:20 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -1798,6 +1798,10 @@
notify_data_t *n_data, pe_working_set_t *data_set)
{
action_t *notify = NULL;
+
+ CRM_CHECK(op != NULL, return);
+ CRM_CHECK(rsc != NULL, return);
+
crm_debug_2("%s: %s", rsc->id, op->uuid);
notify = pe_notify(rsc, node, op->post_notify, op->post_notified,
n_data, data_set);
------------------------------
Message: 5
Date: Tue, 23 May 2006 03:57:52 -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 graph.c
Log Message:
Remove clutter from the action paramters... only a few meta paramters are
useful.
Order monitors after *all* notifications have taken place
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/native.c,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -3 -r1.136 -r1.137
--- native.c 23 May 2006 07:51:20 -0000 1.136
+++ native.c 23 May 2006 09:57:52 -0000 1.137
@@ -1,4 +1,4 @@
-/* $Id: native.c,v 1.136 2006/05/23 07:51:20 andrew Exp $ */
+/* $Id: native.c,v 1.137 2006/05/23 09:57:52 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -1808,6 +1808,11 @@
if(notify != NULL) {
notify->priority = INFINITY;
+ }
+
+ if(op->post_notify != NULL) {
+ notify = op->post_notify;
+ notify->priority = INFINITY;
slist_iter(
mon, action_t, rsc->actions, lpc,
@@ -1823,7 +1828,6 @@
order_actions(notify, mon, pe_ordering_optional);
);
}
- op->post_notify->priority = INFINITY;
}
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/graph.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -3 -r1.89 -r1.90
--- graph.c 22 May 2006 10:55:16 -0000 1.89
+++ graph.c 23 May 2006 09:57:52 -0000 1.90
@@ -1,4 +1,4 @@
-/* $Id: graph.c,v 1.89 2006/05/22 10:55:16 andrew Exp $ */
+/* $Id: graph.c,v 1.90 2006/05/23 09:57:52 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -422,7 +422,27 @@
g_hash_table_foreach(action->meta, hash2metafield, args_xml);
if(action->rsc != NULL) {
- g_hash_table_foreach(action->rsc->meta, hash2metafield,
args_xml);
+ int lpc = 0;
+ const char *key = NULL;
+ const char *value = NULL;
+ const char *meta_list[] = {
+ XML_RSC_ATTR_UNIQUE,
+ XML_RSC_ATTR_INCARNATION,
+ XML_RSC_ATTR_INCARNATION_MAX,
+ XML_RSC_ATTR_INCARNATION_NODEMAX,
+ XML_RSC_ATTR_MASTER_MAX,
+ XML_RSC_ATTR_MASTER_NODEMAX,
+ };
+
+ for(lpc = 0; lpc < DIMOF(meta_list); lpc++) {
+ key = meta_list[lpc];
+ value = g_hash_table_lookup(action->rsc->meta, key);
+ if(value != NULL) {
+ char *crm_name = crm_concat(CRM_META, key, '_');
+ crm_xml_add(args_xml, crm_name, value);
+ crm_free(crm_name);
+ }
+ }
}
crm_log_xml_debug_2(action_xml, "dumped action");
------------------------------
_______________________________________________
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 71
********************************************
