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: include by andrew from
([email protected])
3. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Mon, 22 May 2006 01:16:32 -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
Modified Files:
crm-1.0.dtd
Log Message:
Supply the version number that an lrm_rsc_op entry conforms to.
This will allow the PE to accurately detect attribute changes.
------------------------------
Message: 2
Date: Mon, 22 May 2006 02:06:21 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: include by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : include
Dir : linux-ha/include/crm
Modified Files:
crm.h
Log Message:
CRM sub-namespace (disabled)
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/include/crm/crm.h,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -3 -r1.94 -r1.95
--- crm.h 11 May 2006 09:39:39 -0000 1.94
+++ crm.h 22 May 2006 08:06:21 -0000 1.95
@@ -1,4 +1,4 @@
-/* $Id: crm.h,v 1.94 2006/05/11 09:39:39 andrew Exp $ */
+/* $Id: crm.h,v 1.95 2006/05/22 08:06:21 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -46,6 +46,13 @@
#define CRM_DEPRECATED_SINCE_2_0_5 1
#define CRM_DEPRECATED_SINCE_2_1_0 1
+#define CRM_META "CRM_meta"
+#if 0
+# define crm_meta_name(field) CRM_META"_"field
+#else
+# define crm_meta_name(field) field
+#endif
+
#define ipc_call_diff_max_ms 5000
#define action_diff_warn_ms 5000
#define action_diff_max_ms 20000
------------------------------
Message: 3
Date: Mon, 22 May 2006 02:10:14 -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:
Globally Unique clones need to have all instances probed for
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/incarnation.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -3 -r1.84 -r1.85
--- incarnation.c 17 May 2006 12:27:29 -0000 1.84
+++ incarnation.c 22 May 2006 08:10:14 -0000 1.85
@@ -1,4 +1,4 @@
-/* $Id: incarnation.c,v 1.84 2006/05/17 12:27:29 andrew Exp $ */
+/* $Id: incarnation.c,v 1.85 2006/05/22 08:10:14 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -98,8 +98,8 @@
clone_data->child_list = g_list_append(
clone_data->child_list, child_rsc);
- add_rsc_param(child_rsc, XML_RSC_ATTR_INCARNATION, inc_num);
- add_rsc_param(child_rsc, XML_RSC_ATTR_INCARNATION_MAX, inc_max);
+ add_hash_param(child_rsc->meta, XML_RSC_ATTR_INCARNATION_MAX, inc_max);
+ add_hash_param(child_rsc->parameters,
crm_meta_name(XML_RSC_ATTR_INCARNATION_MAX), inc_max);
print_resource(LOG_DEBUG_3, "Added", child_rsc, FALSE);
@@ -118,15 +118,14 @@
clone_variant_data_t *clone_data = NULL;
resource_t *self = NULL;
- const char *ordered =
- crm_element_value(xml_obj, XML_RSC_ATTR_ORDERED);
- const char *interleave =
- crm_element_value(xml_obj, XML_RSC_ATTR_INTERLEAVE);
-
+ const char *ordered = g_hash_table_lookup(
+ rsc->meta, XML_RSC_ATTR_ORDERED);
+ const char *interleave = g_hash_table_lookup(
+ rsc->meta, XML_RSC_ATTR_INTERLEAVE);
const char *max_clones = g_hash_table_lookup(
- rsc->parameters, XML_RSC_ATTR_INCARNATION_MAX);
+ rsc->meta, XML_RSC_ATTR_INCARNATION_MAX);
const char *max_clones_node = g_hash_table_lookup(
- rsc->parameters, XML_RSC_ATTR_INCARNATION_NODEMAX);
+ rsc->meta, XML_RSC_ATTR_INCARNATION_NODEMAX);
crm_debug_3("Processing resource %s...", rsc->id);
@@ -551,12 +550,12 @@
CRMD_ACTION_NOTIFY, NULL,
action->optional, TRUE, data_set);
- add_hash_param(notify->extra, "notify_type", "pre");
- add_hash_param(notify->extra, "notify_operation", action->task);
+ add_hash_param(notify->meta, "notify_type", "pre");
+ add_hash_param(notify->meta, "notify_operation", action->task);
if(clone_data->notify_confirm) {
- add_hash_param(notify->extra, "notify_confirm", "yes");
+ add_hash_param(notify->meta, "notify_confirm", "yes");
} else {
- add_hash_param(notify->extra, "notify_confirm", "no");
+ add_hash_param(notify->meta, "notify_confirm", "no");
}
notify->pseudo = TRUE;
@@ -566,12 +565,12 @@
notify_complete = custom_action(clone_data->self, notify_key,
CRMD_ACTION_NOTIFIED, NULL,
action->optional, TRUE, data_set);
- add_hash_param(notify_complete->extra, "notify_type", "pre");
- add_hash_param(notify_complete->extra, "notify_operation",
action->task);
+ add_hash_param(notify_complete->meta, "notify_type", "pre");
+ add_hash_param(notify_complete->meta, "notify_operation", action->task);
if(clone_data->notify_confirm) {
- add_hash_param(notify->extra, "notify_confirm", "yes");
+ add_hash_param(notify->meta, "notify_confirm", "yes");
} else {
- add_hash_param(notify->extra, "notify_confirm", "no");
+ add_hash_param(notify->meta, "notify_confirm", "no");
}
notify->pseudo = TRUE;
notify_complete->pseudo = TRUE;
@@ -597,12 +596,12 @@
notify = custom_action(clone_data->self, notify_key,
CRMD_ACTION_NOTIFY, NULL,
action_complete->optional, TRUE, data_set);
- add_hash_param(notify->extra, "notify_type", "post");
- add_hash_param(notify->extra, "notify_operation", action->task);
+ add_hash_param(notify->meta, "notify_type", "post");
+ add_hash_param(notify->meta, "notify_operation", action->task);
if(clone_data->notify_confirm) {
- add_hash_param(notify->extra, "notify_confirm", "yes");
+ add_hash_param(notify->meta, "notify_confirm", "yes");
} else {
- add_hash_param(notify->extra, "notify_confirm", "no");
+ add_hash_param(notify->meta, "notify_confirm", "no");
}
notify->pseudo = TRUE;
@@ -618,12 +617,12 @@
notify_complete = custom_action(clone_data->self, notify_key,
CRMD_ACTION_NOTIFIED, NULL,
action->optional, TRUE, data_set);
- add_hash_param(notify_complete->extra, "notify_type", "pre");
- add_hash_param(notify_complete->extra, "notify_operation",
action->task);
+ add_hash_param(notify_complete->meta, "notify_type", "pre");
+ add_hash_param(notify_complete->meta, "notify_operation", action->task);
if(clone_data->notify_confirm) {
- add_hash_param(notify->extra, "notify_confirm", "yes");
+ add_hash_param(notify->meta, "notify_confirm", "yes");
} else {
- add_hash_param(notify->extra, "notify_confirm", "no");
+ add_hash_param(notify->meta, "notify_confirm", "no");
}
notify_complete->pseudo = TRUE;
@@ -1236,7 +1235,7 @@
/* action, action_t, clone_data->self->actions, lpc2, */
/* if(safe_str_eq(action->task, CRMD_ACTION_NOTIFY)) { */
-/* action->extra_xml = notify_xml; */
+/* action->meta_xml = notify_xml; */
/* } */
/* ); */
@@ -1405,7 +1404,8 @@
slist_iter(
child_rsc, resource_t, clone_data->child_list, lpc,
- if(num_probes >= clone_data->clone_node_max) {
+ if(rsc->globally_unique == FALSE
+ && num_probes >= clone_data->clone_node_max) {
return FALSE;
}
if(pe_find_node_id(child_rsc->running_on, node->details->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 64
********************************************
