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 davidlee from
([email protected])
3. Linux-HA CVS: crm by andrew from
([email protected])
4. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Thu, 20 Apr 2006 03:01:08 -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/crmd
Modified Files:
utils.c
Log Message:
This timer can go off in "normal" circumstances
- when a TE action takes a very long time to complete
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/utils.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -3 -r1.90 -r1.91
--- utils.c 9 Apr 2006 14:50:04 -0000 1.90
+++ utils.c 20 Apr 2006 09:01:01 -0000 1.91
@@ -123,6 +123,7 @@
if(timer == wait_timer
|| timer == recheck_timer
+ || timer == finalization_timer
|| timer == election_trigger) {
crm_info("%s (%s) just popped!",
get_timer_desc(timer),
------------------------------
Message: 2
Date: Thu, 20 Apr 2006 03:02:13 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: heartbeat by davidlee from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : davidlee
Host :
Project : linux-ha
Module : heartbeat
Dir : linux-ha/heartbeat
Modified Files:
findif.c
Log Message:
A ':' in an interface name is probably an error (but for now treat as a mere
warning).
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat/findif.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -3 -r1.59 -r1.60
--- findif.c 10 Apr 2006 09:55:02 -0000 1.59
+++ findif.c 20 Apr 2006 09:02:13 -0000 1.60
@@ -1,4 +1,4 @@
-/* $Id: findif.c,v 1.59 2006/04/10 09:55:02 andrew Exp $ */
+/* $Id: findif.c,v 1.60 2006/04/20 09:02:13 davidlee Exp $ */
/*
* findif.c: Finds an interface which can route a given address
*
@@ -511,13 +511,21 @@
ValidateIFName(const char *ifname, struct ifreq *ifr)
{
int skfd = -1;
-
+ char *colonptr;
+
if ( (skfd = socket(PF_INET, SOCK_DGRAM, 0)) == -1 ) {
fprintf(stderr, "%s\n", strerror(errno));
return 0;
}
strncpy(ifr->ifr_name, ifname, IFNAMSIZ);
+
+ /* Contain a ":"? Probably an error, but treat as warning at present */
+ if ((colonptr = strchr(ifname, ':')) != NULL) {
+ fprintf(stderr, "%s: warning: name may be invalid\n",
+ ifr->ifr_name);
+ }
+
if (ioctl(skfd, SIOCGIFFLAGS, ifr) < 0) {
fprintf(stderr, "%s: unknown interface: %s\n"
, ifr->ifr_name, strerror(errno));
@@ -903,6 +911,9 @@
/*
* $Log: findif.c,v $
+ * Revision 1.60 2006/04/20 09:02:13 davidlee
+ * A ':' in an interface name is probably an error (but for now treat as a
mere warning).
+ *
* Revision 1.59 2006/04/10 09:55:02 andrew
* Fix findif for any OS that doesnt use /proc/route
*
------------------------------
Message: 3
Date: Thu, 20 Apr 2006 04:33:50 -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:
Make sure demotions and promotions happen in the right order
Cancel any promotions that were already created if the start action is
not runnable
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/native.c,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -3 -r1.128 -r1.129
--- native.c 18 Apr 2006 11:15:37 -0000 1.128
+++ native.c 20 Apr 2006 10:33:49 -0000 1.129
@@ -1,4 +1,4 @@
-/* $Id: native.c,v 1.128 2006/04/18 11:15:37 andrew Exp $ */
+/* $Id: native.c,v 1.129 2006/04/20 10:33:49 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -574,6 +574,12 @@
void native_internal_constraints(resource_t *rsc, pe_working_set_t *data_set)
{
order_restart(rsc);
+ custom_action_order(rsc, demote_key(rsc), NULL,
+ rsc, stop_key(rsc), NULL,
+ pe_ordering_manditory, data_set);
+ custom_action_order(rsc, start_key(rsc), NULL,
+ rsc, promote_key(rsc), NULL,
+ pe_ordering_optional, data_set);
}
void native_rsc_colocation_lh(
@@ -1986,6 +1992,7 @@
PromoteRsc(resource_t *rsc, node_t *next, pe_working_set_t *data_set)
{
char *key = NULL;
+ gboolean runnable = TRUE;
GListPtr action_list = NULL;
crm_debug_2("Executing: %s", rsc->id);
@@ -1997,14 +2004,26 @@
slist_iter(start, action_t, action_list, lpc,
if(start->runnable == FALSE) {
- crm_debug("%s\tPromote %s (canceled)",
- next->details->uname, rsc->id);
- return TRUE;
+ runnable = FALSE;
}
);
+
+ if(runnable) {
+ promote_action(rsc, next, FALSE);
+ crm_notice("%s\tPromote %s", next->details->uname, rsc->id);
+ return TRUE;
+ }
+
+ crm_debug("%s\tPromote %s (canceled)", next->details->uname, rsc->id);
+
+ key = promote_key(rsc);
+ action_list = find_actions_exact(rsc->actions, key, next);
+ crm_free(key);
+
+ slist_iter(promote, action_t, action_list, lpc,
+ promote->runnable = FALSE;
+ );
- crm_notice("%s\tPromote %s", next->details->uname, rsc->id);
- promote_action(rsc, next, FALSE);
return TRUE;
}
------------------------------
Message: 4
Date: Thu, 20 Apr 2006 04:55:23 -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:
crmadmin.c
Log Message:
Logging
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/crmadmin.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -3 -r1.66 -r1.67
--- crmadmin.c 6 Apr 2006 16:46:48 -0000 1.66
+++ crmadmin.c 20 Apr 2006 10:55:22 -0000 1.67
@@ -1,4 +1,4 @@
-/* $Id: crmadmin.c,v 1.66 2006/04/06 16:46:48 lars Exp $ */
+/* $Id: crmadmin.c,v 1.67 2006/04/20 10:55:22 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -544,7 +544,7 @@
} else if (validate_crm_message(
new_input->msg, crm_system_name, admin_uuid,
XML_ATTR_RESPONSE) == FALSE) {
- crm_info("Message was not a CRM response. Discarding.");
+ crm_debug_2("Message was not a CRM response.
Discarding.");
continue;
}
------------------------------
_______________________________________________
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 105
*********************************************
