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: lib 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: lib by andrew from
([email protected])
5. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Thu, 16 Mar 2006 16:35:26 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/crm/common
Modified Files:
utils.c
Log Message:
There are situations when we need to remove the cached value.
Add a function to allow this.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/utils.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- utils.c 11 Mar 2006 21:15:15 -0000 1.33
+++ utils.c 16 Mar 2006 23:35:25 -0000 1.34
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.33 2006/03/11 21:15:15 andrew Exp $ */
+/* $Id: utils.c,v 1.34 2006/03/16 23:35:25 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -570,6 +570,14 @@
static GHashTable *crm_uuid_cache = NULL;
static GHashTable *crm_uname_cache = NULL;
+void
+unget_uuid(const char *uname)
+{
+ if(crm_uuid_cache == NULL) {
+ return;
+ }
+ g_hash_table_remove(crm_uuid_cache, uname);
+}
const char *
get_uuid(ll_cluster_t *hb, const char *uname)
{
------------------------------
Message: 2
Date: Thu, 16 Mar 2006 16:45:41 -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:
lrm.c
Log Message:
Fix TE detection of cancelled ops
- have the PE include the interval
- have the crmd use monitor instead of cancel as the operation
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/lrm.c,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -3 -r1.170 -r1.171
--- lrm.c 14 Mar 2006 16:19:31 -0000 1.170
+++ lrm.c 16 Mar 2006 23:45:41 -0000 1.171
@@ -822,11 +822,13 @@
rsc = fsa_lrm_conn->lrm_ops->get_rsc(fsa_lrm_conn, rid);
if(safe_str_eq(operation, CRMD_ACTION_CANCEL)) {
- lrm_op_t* op = construct_op(
- input->xml, id_from_cib, operation);
- const char *op_key = crm_element_value(
- xml_rsc, "operation_key");
+ lrm_op_t* op = NULL;
+ const char *op_key = NULL;
+ op_key = crm_element_value(xml_rsc, "operation_key");
+ op = construct_op(
+ input->xml, id_from_cib, CRMD_ACTION_STATUS);
+
CRM_ASSERT(op != NULL);
if(op_key == NULL) {
crm_err("No operation to cancel");
------------------------------
Message: 3
Date: Thu, 16 Mar 2006 16:45:42 -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:
unpack.c
Log Message:
Fix TE detection of cancelled ops
- have the PE include the interval
- have the crmd use monitor instead of cancel as the operation
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/unpack.c,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -3 -r1.163 -r1.164
--- unpack.c 14 Mar 2006 16:20:13 -0000 1.163
+++ unpack.c 16 Mar 2006 23:45:41 -0000 1.164
@@ -1,4 +1,4 @@
-/* $Id: unpack.c,v 1.163 2006/03/14 16:20:13 andrew Exp $ */
+/* $Id: unpack.c,v 1.164 2006/03/16 23:45:41 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -1140,6 +1140,7 @@
const char *actual_rc = NULL;
const char *target_rc = NULL;
const char *task_status = NULL;
+ const char *interval_s = NULL;
int interval = 0;
int task_id_i = -1;
@@ -1187,7 +1188,7 @@
role2text(rsc->role));
if(params != NULL) {
- const char *interval_s = crm_element_value(params, "interval");
+ interval_s = crm_element_value(params, "interval");
if(interval_s != NULL) {
interval = crm_parse_int(interval_s, NULL);
}
@@ -1236,6 +1237,8 @@
action = custom_action(
rsc, crm_strdup(id), CRMD_ACTION_CANCEL, node,
FALSE, TRUE, data_set);
+
+ add_hash_param(action->extra, "interval", interval_s);
custom_action_order(
rsc, NULL, action,
------------------------------
Message: 4
Date: Thu, 16 Mar 2006 17:42:16 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/crm/transition
Modified Files:
graph.c
Log Message:
Logging
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/transition/graph.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- graph.c 16 Mar 2006 23:34:30 -0000 1.6
+++ graph.c 17 Mar 2006 00:42:16 -0000 1.7
@@ -1,4 +1,4 @@
-/* $Id: graph.c,v 1.6 2006/03/16 23:34:30 andrew Exp $ */
+/* $Id: graph.c,v 1.7 2006/03/17 00:42:16 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -315,7 +315,7 @@
"====================================================");
crm_log_maybe(stat_log_level,
"Transition %d: (Complete=%d, Pending=%d,"
- " Fired=%d, Skipped=%d, Incomplete=%d",
+ " Fired=%d, Skipped=%d, Incomplete=%d)",
graph->id, num_complete, num_pending, num_fired,
num_skipped, num_incomplete);
------------------------------
Message: 5
Date: Thu, 16 Mar 2006 17:43:29 -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:
unpack.c
Log Message:
Make the cancellation code more flexible
- now we can ack any cancelled operation, not just monitors
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/unpack.c,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -3 -r1.164 -r1.165
--- unpack.c 16 Mar 2006 23:45:41 -0000 1.164
+++ unpack.c 17 Mar 2006 00:43:29 -0000 1.165
@@ -1,4 +1,4 @@
-/* $Id: unpack.c,v 1.164 2006/03/16 23:45:41 andrew Exp $ */
+/* $Id: unpack.c,v 1.165 2006/03/17 00:43:29 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -1239,6 +1239,7 @@
FALSE, TRUE, data_set);
add_hash_param(action->extra, "interval", interval_s);
+ add_hash_param(action->extra, "task", task);
custom_action_order(
rsc, NULL, 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 28, Issue 33
********************************************
