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: lrm by sunjd 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, 15 May 2006 03:06:22 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lrm by sunjd from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : sunjd
Host :
Project : linux-ha
Module : lrm
Dir : linux-ha/lrm/lrmd
Modified Files:
lrmd.c
Log Message:
prevent null object to be added
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lrm/lrmd/lrmd.c,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -3 -r1.221 -r1.222
--- lrmd.c 22 Apr 2006 10:31:51 -0000 1.221
+++ lrmd.c 15 May 2006 09:06:21 -0000 1.222
@@ -1,4 +1,4 @@
-/* $Id: lrmd.c,v 1.221 2006/04/22 10:31:51 andrew Exp $ */
+/* $Id: lrmd.c,v 1.222 2006/05/15 09:06:21 sunjd Exp $ */
/*
* Local Resource Manager Daemon
*
@@ -2010,7 +2010,9 @@
}
else {
if (0 <= RAExec->get_provider_list(rtype, &providers)) {
- cl_msg_add_list(ret, F_LRM_RPROVIDERS, providers);
+ if (providers != NULL) {
+ cl_msg_add_list(ret, F_LRM_RPROVIDERS,
providers);
+ }
while (NULL != (provider = g_list_first(providers))) {
providers = g_list_remove_link(providers,
provider);
g_free(provider->data);
@@ -3802,6 +3804,9 @@
}
/*
* $Log: lrmd.c,v $
+ * Revision 1.222 2006/05/15 09:06:21 sunjd
+ * prevent null object to be added
+ *
* Revision 1.221 2006/04/22 10:31:51 andrew
* There can (and will) be multiple monitor operations, the LRM needs to track
* the last occurance of *all* of them
------------------------------
Message: 2
Date: Mon, 15 May 2006 03:30:01 -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/cib
Modified Files:
messages.c
Log Message:
Fix for Novell #174049, OSDL #1247
- partial CIB replacements were not incrementing the updates counter,
causing the broadcasted update diff to be invalid
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/messages.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -3 -r1.77 -r1.78
--- messages.c 8 May 2006 07:42:17 -0000 1.77
+++ messages.c 15 May 2006 09:30:00 -0000 1.78
@@ -1,4 +1,4 @@
-/* $Id: messages.c,v 1.77 2006/05/08 07:42:17 andrew Exp $ */
+/* $Id: messages.c,v 1.78 2006/05/15 09:30:00 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -553,8 +553,9 @@
} else if(safe_str_eq(section, XML_CIB_TAG_STATUS)) {
send_notify = TRUE;
}
+ cib_update_counter(*result_cib, XML_ATTR_NUMUPDATES, FALSE);
}
-
+
if(send_notify) {
crm_data_t *local_diff = NULL;
local_diff = diff_cib_object(existing_cib, *result_cib, FALSE);
@@ -562,10 +563,6 @@
free_xml(local_diff);
}
- if(result == cib_ok && section != NULL) {
- cib_update_counter(*result_cib, XML_ATTR_NUMUPDATES, FALSE);
- }
-
return result;
}
------------------------------
Message: 3
Date: Mon, 15 May 2006 03:40:54 -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
Log Message:
OSDL #1252: Resources are not probed for when added
Probe any resource on any node that has not already been checked for.
This includes resources that were just added to the configuration.
Update testcase outputs
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/stages.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -3 -r1.92 -r1.93
--- stages.c 22 Apr 2006 10:28:08 -0000 1.92
+++ stages.c 15 May 2006 09:40:54 -0000 1.93
@@ -1,4 +1,4 @@
-/* $Id: stages.c,v 1.92 2006/04/22 10:28:08 andrew Exp $ */
+/* $Id: stages.c,v 1.93 2006/05/15 09:40:54 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -173,11 +173,7 @@
node->details->attrs, CRM_OP_PROBED);
crm_debug("%s probed: %s", node->details->uname, probed);
-
- if(crm_is_true(probed)) {
- continue;
-
- } else if(node->details->online == FALSE) {
+ if(node->details->online == FALSE) {
continue;
} else if(node->details->unclean) {
@@ -190,21 +186,23 @@
data_set);
probe_complete->pseudo = TRUE;
+ probe_complete->optional = TRUE;
}
- if(probed != NULL) {
+ if(probed != NULL && crm_is_true(probed) == FALSE) {
force_probe = TRUE;
}
probe_node_complete = custom_action(
NULL, crm_strdup(CRM_OP_PROBED),
CRM_OP_PROBED, node, FALSE, TRUE, data_set);
+ probe_node_complete->optional = crm_is_true(probed);
add_hash_param(probe_node_complete->extra,
XML_ATTR_TE_NOWAIT, XML_BOOLEAN_TRUE);
-
+
custom_action_order(NULL, NULL, probe_node_complete,
NULL, NULL, probe_complete,
- pe_ordering_manditory, data_set);
+ pe_ordering_optional, data_set);
slist_iter(
rsc, resource_t, data_set->resources, lpc2,
@@ -212,6 +210,9 @@
if(rsc->fns->create_probe(
rsc, node, probe_node_complete,
force_probe, data_set)) {
+
+ probe_complete->optional = FALSE;
+ probe_node_complete->optional = FALSE;
custom_action_order(
NULL, NULL, probe_complete,
rsc, start_key(rsc), NULL,
------------------------------
Message: 4
Date: Mon, 15 May 2006 04:03:31 -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/admin
Modified Files:
crm_resource.c
Log Message:
Rearrange for maintainability
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/crm_resource.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- crm_resource.c 8 May 2006 12:12:42 -0000 1.27
+++ crm_resource.c 15 May 2006 10:03:30 -0000 1.28
@@ -1,4 +1,4 @@
-/* $Id: crm_resource.c,v 1.27 2006/05/08 12:12:42 andrew Exp $ */
+/* $Id: crm_resource.c,v 1.28 2006/05/15 10:03:30 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -642,7 +642,7 @@
if(rsc != NULL) {
rsc_id = rsc->id;
- } else if(rsc_cmd != 'C') {
+ } else {
rc = cib_NOTEXISTS;
}
@@ -668,6 +668,27 @@
rc = cib_ok;
do_find_resource_list(&data_set);
+ } else if(rsc_cmd == 'C') {
+ resource_t *rsc = pe_find_resource(data_set.resources, rsc_id);
+
+ delete_lrm_rsc(crmd_channel, host_uname,
+ rsc?rsc->id:rsc_id, rsc?rsc->long_name:NULL);
+
+ sleep(5);
+ refresh_lrm(crmd_channel, host_uname);
+
+ if(rsc != NULL) {
+ char *now_s = NULL;
+ time_t now = time(NULL);
+
+ /* force the TE to start a transition */
+ sleep(5); /* wait for the refresh */
+ now_s = crm_itoa(now);
+ update_attr(cib_conn, cib_sync_call,
+ NULL, NULL, NULL, NULL, "last-lrm-refresh",
now_s);
+ crm_free(now_s);
+ }
+
} else if(rc == cib_NOTEXISTS) {
fprintf(stderr, "Resource %s not found: %s\n",
crm_str(rsc_id), cib_error2string(rc));
@@ -764,8 +785,11 @@
} else if(rsc_cmd == 'D') {
crm_data_t *msg_data = NULL;
- CRM_DEV_ASSERT(rsc_type != NULL);
- CRM_DEV_ASSERT(rsc_id != NULL);
+ CRM_CHECK(rsc_id != NULL, return -1);
+ if(rsc_type == NULL) {
+ fprintf(stderr, "You need to specify a resource type
with -t");
+ return -1;
+ }
msg_data = create_xml_node(NULL, rsc_type);
crm_xml_add(msg_data, XML_ATTR_ID, rsc_id);
@@ -774,26 +798,6 @@
msg_data, NULL, cib_sync_call);
free_xml(msg_data);
- } else if(rsc_cmd == 'C') {
- resource_t *rsc = pe_find_resource(data_set.resources, rsc_id);
-
- delete_lrm_rsc(crmd_channel, host_uname, rsc?rsc->id:rsc_id,
rsc?rsc->long_name:NULL);
-
- sleep(5);
- refresh_lrm(crmd_channel, host_uname);
-
- if(rsc != NULL) {
- char *now_s = NULL;
- time_t now = time(NULL);
-
- /* force the TE to start a transition */
- sleep(5); /* wait for the refresh */
- now_s = crm_itoa(now);
- update_attr(cib_conn, cib_sync_call,
- NULL, NULL, NULL, NULL, "last-lrm-refresh",
now_s);
- crm_free(now_s);
- }
-
} else {
fprintf(stderr, "Unknown command: %c\n", rsc_cmd);
}
------------------------------
_______________________________________________
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 43
********************************************
