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])
----------------------------------------------------------------------
Message: 1
Date: Mon, 22 May 2006 05:26:25 -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:
join_dc.c
Log Message:
Downgrade an error
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/join_dc.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -3 -r1.89 -r1.90
--- join_dc.c 18 Apr 2006 10:59:46 -0000 1.89
+++ join_dc.c 22 May 2006 11:26:25 -0000 1.90
@@ -69,7 +69,7 @@
}
} else {
- crm_err("Couldn't connect to attrd");
+ crm_info("Couldn't connect to attrd this time");
}
}
------------------------------
Message: 2
Date: Mon, 22 May 2006 09:30:06 -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 unpack.c
Log Message:
Logging changes
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/stages.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -3 -r1.94 -r1.95
--- stages.c 22 May 2006 08:27:33 -0000 1.94
+++ stages.c 22 May 2006 15:30:06 -0000 1.95
@@ -1,4 +1,4 @@
-/* $Id: stages.c,v 1.94 2006/05/22 08:27:33 andrew Exp $ */
+/* $Id: stages.c,v 1.95 2006/05/22 15:30:06 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -172,7 +172,7 @@
const char *probed = g_hash_table_lookup(
node->details->attrs, CRM_OP_PROBED);
- crm_debug("%s probed: %s", node->details->uname, probed);
+ crm_debug_2("%s probed: %s", node->details->uname, probed);
if(node->details->online == FALSE) {
continue;
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/unpack.c,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -3 -r1.195 -r1.196
--- unpack.c 22 May 2006 08:27:33 -0000 1.195
+++ unpack.c 22 May 2006 15:30:06 -0000 1.196
@@ -1,4 +1,4 @@
-/* $Id: unpack.c,v 1.195 2006/05/22 08:27:33 andrew Exp $ */
+/* $Id: unpack.c,v 1.196 2006/05/22 15:30:06 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -596,27 +596,32 @@
}
if(online) {
- crm_debug_2("Node %s is online", this_node->details->uname);
this_node->details->online = TRUE;
} else {
/* remove node from contention */
this_node->fixed = TRUE;
this_node->weight = -INFINITY;
- crm_debug_2("Node %s is down", this_node->details->uname);
}
if(online && this_node->details->shutdown) {
/* dont run resources here */
this_node->fixed = TRUE;
this_node->weight = -INFINITY;
- crm_debug_2("Node %s is due for shutdown",
- this_node->details->uname);
}
-
+
if(this_node->details->unclean) {
pe_proc_warn("Node %s is unclean", this_node->details->uname);
+
+ } else if(this_node->details->online) {
+ crm_info("Node %s is %s", this_node->details->uname,
+ this_node->details->shutdown?"shutting down":"online");
+
+ } else {
+ crm_debug_2("Node %s is offline", this_node->details->uname);
}
+
+
return online;
}
@@ -1225,14 +1230,14 @@
if(interval > 0) {
crm_data_t *op_match = NULL;
- crm_err("Checking parameters for %s %s", key, task);
+ crm_debug_2("Checking parameters for %s %s", key, task);
op_match = find_rsc_op_entry(rsc, key);
if(op_match == NULL && data_set->stop_action_orphans) {
/* create a cancel action */
action_t *cancel = NULL;
- pe_config_err("Orphan action will be stopped: %s on %s",
- key, active_node->details->uname);
+ crm_info("Orphan action will be stopped: %s on %s",
+ key, active_node->details->uname);
crm_free(key);
key = generate_op_key(rsc->id, CRMD_ACTION_CANCEL,
interval);
@@ -1251,8 +1256,8 @@
pe_ordering_optional, data_set);
}
if(op_match == NULL) {
- pe_config_err("Orphan action detected: %s on %s",
- key, active_node->details->uname);
+ crm_debug("Orphan action detected: %s on %s",
+ key, active_node->details->uname);
return TRUE;
}
}
------------------------------
Message: 3
Date: Mon, 22 May 2006 09:31:30 -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:
Fix clone migration in response to shutdowns when clone_max < num active nodes
Bug reported by Guy Coates
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/incarnation.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -3 -r1.88 -r1.89
--- incarnation.c 22 May 2006 08:27:33 -0000 1.88
+++ incarnation.c 22 May 2006 15:31:30 -0000 1.89
@@ -1,4 +1,4 @@
-/* $Id: incarnation.c,v 1.88 2006/05/22 08:27:33 andrew Exp $ */
+/* $Id: incarnation.c,v 1.89 2006/05/22 15:31:30 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -346,6 +346,7 @@
if(child->provisional == FALSE) {
CRM_CHECK(child->color != NULL, continue);
current =
child->color->details->chosen_node;
+
} else if(child->running_on != NULL) {
current = child->running_on->data;
}
@@ -354,6 +355,12 @@
crm_debug_2("Not active: %s", child->id);
continue;
+ } else if(current->details->online == FALSE
+ || current->details->unclean
+ || current->details->shutdown) {
+ crm_debug_2("Unavailable node: %s",
child->id);
+ continue;
+
} else if(current->details != a_node->details) {
crm_debug_2("Wrong node: %s", child->id);
continue;
@@ -379,6 +386,7 @@
continue;
}
+ crm_debug_2("Assigning color: %s", child->id);
native_assign_color(child, new_color);
);
@@ -398,6 +406,7 @@
/* allocate the rest */
slist_iter(child, resource_t, clone_data->child_list, lpc2,
if(child->provisional == FALSE) {
+ crm_debug_2("Skipping allocated resource: %s",
child->id);
continue;
}
crm_debug_2("Processing unalloc'd resource: %s", child->id);
------------------------------
_______________________________________________
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 69
********************************************
