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: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Mon, 27 Mar 2006 23:12:24 -0700 (MST)
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 last fix for master/slave... 4 node CTS passes start/stop tests
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/native.c,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -3 -r1.120 -r1.121
--- native.c 27 Mar 2006 15:53:10 -0000 1.120
+++ native.c 28 Mar 2006 06:12:23 -0000 1.121
@@ -1,4 +1,4 @@
-/* $Id: native.c,v 1.120 2006/03/27 15:53:10 andrew Exp $ */
+/* $Id: native.c,v 1.121 2006/03/28 06:12:23 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -1977,10 +1977,10 @@
{
crm_debug_2("Executing: %s", rsc->id);
- CRM_CHECK(rsc->next_role == RSC_ROLE_SLAVE, return FALSE);
+/* CRM_CHECK(rsc->next_role == RSC_ROLE_SLAVE, return FALSE); */
slist_iter(
current, node_t, rsc->running_on, lpc,
- crm_notice("%s\tDeomote %s", next->details->uname, rsc->id);
+ crm_notice("%s\tDeomote %s", current->details->uname, rsc->id);
demote_action(rsc, current, FALSE);
);
return TRUE;
------------------------------
Message: 2
Date: Tue, 28 Mar 2006 01:30:51 -0700 (MST)
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:
callbacks.c control.c
Log Message:
Potential fix for 1151: election bad news
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/callbacks.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -3 -r1.110 -r1.111
--- callbacks.c 17 Mar 2006 01:07:29 -0000 1.110
+++ callbacks.c 28 Mar 2006 08:30:50 -0000 1.111
@@ -371,6 +371,7 @@
if(safe_str_eq(status, ONLINESTATUS)) {
/* remove the cached value in case it changed */
+ crm_info("Uncaching UUID for %s", node);
unget_uuid(node);
}
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/control.c,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -3 -r1.119 -r1.120
--- control.c 20 Feb 2006 17:05:01 -0000 1.119
+++ control.c 28 Mar 2006 08:30:50 -0000 1.120
@@ -682,6 +682,8 @@
crm_err("get_uuid_by_name() failed");
return FALSE;
}
+ /* copy it so that unget_uuid() doesn't trash the value on us */
+ fsa_our_uuid = crm_strdup(fsa_our_uuid);
crm_info("UUID: %s", fsa_our_uuid);
/* Async get client status information in the cluster */
------------------------------
Message: 3
Date: Tue, 28 Mar 2006 01:34:32 -0700 (MST)
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:
election.c
Log Message:
Potential fixes for 1154: Election timeout
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/election.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -3 -r1.106 -r1.107
--- election.c 20 Feb 2006 12:10:41 -0000 1.106
+++ election.c 28 Mar 2006 08:34:32 -0000 1.107
@@ -185,21 +185,22 @@
ha_msg_value_int(vote->msg, F_CRM_ELECTION_ID, &election_id);
- if(fsa_membership_copy == NULL) {
- /* if the membership copy is NULL we REALLY shouldnt be voting
- * the question is how we managed to get here.
- */
- crm_err("Membership copy was NULL");
- return I_NULL;
-
- } else if(fsa_membership_copy->members != NULL) {
- our_node = (oc_node_t*)
-
g_hash_table_lookup(fsa_membership_copy->members,fsa_our_uname);
+ /* if the membership copy is NULL we REALLY shouldnt be voting
+ * the question is how we managed to get here.
+ */
+ CRM_CHECK(fsa_membership_copy != NULL, return I_NULL);
+ CRM_CHECK(fsa_membership_copy->members != NULL, return I_NULL);
+
+ our_node = (oc_node_t*)g_hash_table_lookup(
+ fsa_membership_copy->members, fsa_our_uname);
- your_node = (oc_node_t*)
-
g_hash_table_lookup(fsa_membership_copy->members,vote_from);
+ if(vote_from != NULL) {
+ your_node = (oc_node_t*)g_hash_table_lookup(
+ fsa_membership_copy->members, vote_from);
+ } else {
+ your_node = our_node;
}
-
+
if(voted == NULL) {
crm_debug("Created voted hash");
voted = g_hash_table_new_full(
@@ -212,11 +213,12 @@
char *op_copy = NULL;
char *uname_copy = NULL;
if(safe_str_eq(op, CRM_OP_NOVOTE)) {
- if(safe_str_neq(fsa_our_uuid,election_owner)) {
+ if(safe_str_neq(fsa_our_uuid, election_owner)) {
crm_err("Recieved %s for %s (we are %s)",
op, election_owner, fsa_our_uuid);
}
}
+ crm_debug("Election owner: %s", election_owner);
if(safe_str_eq(fsa_our_uuid, election_owner)) {
if(election_id != current_election_id) {
crm_debug("Ignore old novote from %s: %d vs.
%d",
@@ -226,7 +228,7 @@
uname_copy = crm_strdup(your_node->node_uname);
op_copy = crm_strdup(op);
g_hash_table_replace(voted, uname_copy, op_copy);
- crm_info("Updated voted hash for %s to %s",
uname_copy,op_copy);
+ crm_info("Updated voted hash for %s to %s", uname_copy,
op_copy);
}
} else {
@@ -236,7 +238,7 @@
if(vote_from == NULL || safe_str_eq(vote_from, fsa_our_uname)) {
/* dont count our own vote */
- crm_info("Election ignore: our %s", op);
+ crm_info("Election ignore: our %s (%s)", op,
crm_str(vote_from));
return I_NULL;
} else if(safe_str_eq(op, CRM_OP_NOVOTE)) {
------------------------------
Message: 4
Date: Tue, 28 Mar 2006 01:35:18 -0700 (MST)
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:
Use the node's uname not the unfriendly uuid.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/events.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- events.c 27 Mar 2006 15:54:18 -0000 1.6
+++ events.c 28 Mar 2006 08:35:18 -0000 1.7
@@ -1,4 +1,4 @@
-/* $Id: events.c,v 1.6 2006/03/27 15:54:18 andrew Exp $ */
+/* $Id: events.c,v 1.7 2006/03/28 08:35:18 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -282,7 +282,7 @@
case LRM_OP_NOTSUPPORTED:
action->failed = TRUE;
crm_err("Action %s on %s failed (rc: %d vs. %d): %s",
- update_event, event_node, target_rc, op_rc_i,
+ update_event, this_uname, target_rc, op_rc_i,
op_status2text(op_status_i));
break;
case LRM_OP_CANCELLED:
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 28, Issue 74
********************************************
