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: resources by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Sat, 22 Apr 2006 12:14:11 -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:
unpack.c
Log Message:
Logging
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/unpack.c,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -3 -r1.188 -r1.189
--- unpack.c 22 Apr 2006 17:47:31 -0000 1.188
+++ unpack.c 22 Apr 2006 18:14:10 -0000 1.189
@@ -1,4 +1,4 @@
-/* $Id: unpack.c,v 1.188 2006/04/22 17:47:31 andrew Exp $ */
+/* $Id: unpack.c,v 1.189 2006/04/22 18:14:10 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -1025,7 +1025,7 @@
}
task = crm_element_value(rsc_op, XML_LRM_ATTR_TASK);
/* create the action */
- crm_err("Creating %s/%s", id, node->details->uname);
+ crm_debug_2("Creating %s/%s", id,
node->details->uname);
custom_action(rsc, crm_strdup(id), task, node,
TRUE, TRUE, data_set);
);
@@ -1500,6 +1500,7 @@
if(is_stop_action) {
rsc->role = RSC_ROLE_STOPPED;
+
/* clear any previous failure actions */
*on_fail = action_fail_ignore;
rsc->next_role = RSC_ROLE_UNKNOWN;
------------------------------
Message: 2
Date: Sun, 23 Apr 2006 02:23:41 -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:
ccm.c
Log Message:
Always remove peers from the "voted" hashtable
- we may be in an election
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/ccm.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -3 -r1.104 -r1.105
--- ccm.c 20 Apr 2006 15:43:23 -0000 1.104
+++ ccm.c 23 Apr 2006 08:23:41 -0000 1.105
@@ -1,4 +1,4 @@
-/* $Id: ccm.c,v 1.104 2006/04/20 15:43:23 andrew Exp $ */
+/* $Id: ccm.c,v 1.105 2006/04/23 08:23:41 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -207,18 +207,15 @@
if(integrated_nodes != NULL) {
g_hash_table_remove(integrated_nodes, uname);
}
-
+ if(voted != NULL) {
+ g_hash_table_remove(voted, uname);
+ }
+
if(safe_str_eq(fsa_our_uname, uname)) {
crm_err("We're not part of the cluster anymore");
}
- if(AM_I_DC) {
- /* remove any no-votes they had cast */
- if(voted != NULL) {
- g_hash_table_remove(voted, uname);
- }
-
- } else if(safe_str_eq(uname, fsa_our_dc)) {
+ if(AM_I_DC == FALSE && safe_str_eq(uname, fsa_our_dc)) {
crm_warn("Our DC node (%s) left the cluster", uname);
register_fsa_input(C_FSA_INTERNAL, I_ELECTION, NULL);
}
------------------------------
Message: 3
Date: Sun, 23 Apr 2006 02:47:05 -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:
complex.c
Log Message:
Code tidy-up
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/complex.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -3 -r1.81 -r1.82
--- complex.c 21 Apr 2006 07:33:15 -0000 1.81
+++ complex.c 23 Apr 2006 08:47:05 -0000 1.82
@@ -1,4 +1,4 @@
-/* $Id: complex.c,v 1.81 2006/04/21 07:33:15 andrew Exp $ */
+/* $Id: complex.c,v 1.82 2006/04/23 08:47:05 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -280,10 +280,8 @@
(*rsc)->notify = crm_is_true(value);
value = g_hash_table_lookup((*rsc)->parameters, "is_managed");
- if(value != NULL) {
- if(safe_str_neq("default", value)) {
- cl_str_to_boolean(value, &((*rsc)->is_managed));
- }
+ if(value != NULL && safe_str_neq("default", value)) {
+ cl_str_to_boolean(value, &((*rsc)->is_managed));
}
if((*rsc)->is_managed == FALSE) {
crm_warn("Resource %s is currently not managed", (*rsc)->id);
@@ -325,10 +323,8 @@
}
value = g_hash_table_lookup((*rsc)->parameters, "resource_stickiness");
- if(value != NULL) {
- if(safe_str_neq("default", value)) {
- (*rsc)->stickiness = char2score(value);
- }
+ if(value != NULL && safe_str_neq("default", value)) {
+ (*rsc)->stickiness = char2score(value);
}
if((*rsc)->stickiness > 0) {
crm_debug_2("\tPlacement: prefer current location%s",
------------------------------
Message: 4
Date: Sun, 23 Apr 2006 03:47:53 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: resources by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : resources
Dir : linux-ha/resources/OCF
Modified Files:
.cvsignore
Log Message:
new RA
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- .cvsignore 27 Mar 2006 05:45:29 -0000 1.5
+++ .cvsignore 23 Apr 2006 09:47:53 -0000 1.6
@@ -32,3 +32,4 @@
ocf-shellfuncs
ClusterMon
Xen
+pingd
------------------------------
_______________________________________________
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 119
*********************************************
