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, 8 May 2006 01:30:42 -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_attribute.c
Log Message:
Look for the failure count in the correct place
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/crm_attribute.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- crm_attribute.c 10 Apr 2006 12:51:13 -0000 1.13
+++ crm_attribute.c 8 May 2006 07:30:42 -0000 1.14
@@ -1,4 +1,4 @@
-/* $Id: crm_attribute.c,v 1.13 2006/04/10 12:51:13 andrew Exp $ */
+/* $Id: crm_attribute.c,v 1.14 2006/05/08 07:30:42 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -279,9 +279,8 @@
return 1;
}
- set_name = crm_concat("crmd-transient",dest_node, '-');
+ set_name = NULL;
attr_name = crm_concat("fail-count", rsc_id, '-');
- attr_id = crm_concat(attr_name, dest_node, '-');
} else if(safe_str_eq(crm_system_name, "crm_standby")) {
if(dest_node == NULL) {
------------------------------
Message: 2
Date: Mon, 8 May 2006 01:36:02 -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:
complex.c
Log Message:
If target_role is set to anything other than "default", then any previous
value for is_managed (either for the resource or the global default) is
ignored.
Resources that are badly messed up may still be "automatically" marked as
unmanaged - we may look at changing this in the future.
This should make adding resources and debuging RAs slightly easier.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/complex.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -3 -r1.84 -r1.85
--- complex.c 5 May 2006 13:08:49 -0000 1.84
+++ complex.c 8 May 2006 07:36:01 -0000 1.85
@@ -1,4 +1,4 @@
-/* $Id: complex.c,v 1.84 2006/05/05 13:08:49 andrew Exp $ */
+/* $Id: complex.c,v 1.85 2006/05/08 07:36:01 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -296,15 +296,7 @@
if(value != NULL && safe_str_neq("default", value)) {
cl_str_to_boolean(value, &((*rsc)->is_managed));
}
- if((*rsc)->is_managed == FALSE) {
- crm_warn("Resource %s is currently not managed", (*rsc)->id);
- } else if(data_set->symmetric_cluster) {
- rsc_to_node_t *new_con = rsc2node_new(
- "symmetric_default", *rsc, 0, NULL, data_set);
- new_con->node_list_rh = node_list_dup(data_set->nodes, FALSE);
- }
-
crm_debug_2("Options for %s", (*rsc)->id);
value = g_hash_table_lookup((*rsc)->parameters, "globally_unique");
if(value != NULL) {
@@ -361,7 +353,8 @@
value = g_hash_table_lookup(
(*rsc)->parameters, XML_RSC_ATTR_TARGET_ROLE);
- if(value != NULL) {
+ if(value != NULL && safe_str_neq("default", value)) {
+ (*rsc)->is_managed = TRUE;
(*rsc)->next_role = text2role(value);
if((*rsc)->next_role == RSC_ROLE_UNKNOWN) {
pe_config_err("%s: Unknown value for "
@@ -375,6 +368,15 @@
crm_debug_2("\tDesired next state: %s",
(*rsc)->next_role!=RSC_ROLE_UNKNOWN?role2text((*rsc)->next_role):"default");
+ if((*rsc)->is_managed == FALSE) {
+ crm_warn("Resource %s is currently not managed", (*rsc)->id);
+
+ } else if(data_set->symmetric_cluster) {
+ rsc_to_node_t *new_con = rsc2node_new(
+ "symmetric_default", *rsc, 0, NULL, data_set);
+ new_con->node_list_rh = node_list_dup(data_set->nodes, FALSE);
+ }
+
crm_debug_2("\tNotification of start/stop actions: %s",
(*rsc)->notify?"required":"not required");
------------------------------
Message: 3
Date: Mon, 8 May 2006 01:42:18 -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:
The case used for these strings is not interesting to us, use strcasecmp()
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/messages.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -3 -r1.76 -r1.77
--- messages.c 5 May 2006 12:54:33 -0000 1.76
+++ messages.c 8 May 2006 07:42:17 -0000 1.77
@@ -1,4 +1,4 @@
-/* $Id: messages.c,v 1.76 2006/05/05 12:54:33 andrew Exp $ */
+/* $Id: messages.c,v 1.77 2006/05/08 07:42:17 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -116,7 +116,7 @@
result = cib_operation;
crm_err("No operation specified");
- } else if(strcmp(CRM_OP_NOOP, op) == 0) {
+ } else if(strcasecmp(CRM_OP_NOOP, op) == 0) {
;
} else {
@@ -638,13 +638,13 @@
failed = create_xml_node(NULL, XML_TAG_FAILED);
- if (strcmp(CIB_OP_CREATE, op) == 0) {
+ if (strcasecmp(CIB_OP_CREATE, op) == 0) {
cib_update_op = CIB_UPDATE_OP_ADD;
- } else if (strcmp(CIB_OP_UPDATE, op) == 0) {
+ } else if (strcasecmp(CIB_OP_UPDATE, op) == 0) {
cib_update_op = CIB_UPDATE_OP_MODIFY;
- } else if (strcmp(CIB_OP_DELETE_ALT, op) == 0) {
+ } else if (strcasecmp(CIB_OP_DELETE_ALT, op) == 0) {
cib_update_op = CIB_UPDATE_OP_DELETE;
} else {
------------------------------
Message: 4
Date: Mon, 8 May 2006 01:42:18 -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:
cibadmin.c crm_resource.c crmadmin.c
Log Message:
The case used for these strings is not interesting to us, use strcasecmp()
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/cibadmin.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -3 -r1.51 -r1.52
--- cibadmin.c 5 May 2006 12:52:43 -0000 1.51
+++ cibadmin.c 8 May 2006 07:42:17 -0000 1.52
@@ -1,4 +1,4 @@
-/* $Id: cibadmin.c,v 1.51 2006/05/05 12:52:43 andrew Exp $ */
+/* $Id: cibadmin.c,v 1.52 2006/05/08 07:42:17 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -369,17 +369,17 @@
do_work(crm_data_t *input, int call_options, crm_data_t **output)
{
/* construct the request */
- if (strcmp(CIB_OP_SYNC, cib_action) == 0) {
+ if (strcasecmp(CIB_OP_SYNC, cib_action) == 0) {
crm_debug_4("Performing %s op...", cib_action);
return the_cib->cmds->sync_from(
the_cib, host, obj_type, call_options);
- } else if (strcmp(CIB_OP_SLAVE, cib_action) == 0
+ } else if (strcasecmp(CIB_OP_SLAVE, cib_action) == 0
&& (call_options ^ cib_scope_local) ) {
crm_debug_4("Performing %s op on all nodes...", cib_action);
return the_cib->cmds->set_slave_all(the_cib, call_options);
- } else if (strcmp(CIB_OP_MASTER, cib_action) == 0) {
+ } else if (strcasecmp(CIB_OP_MASTER, cib_action) == 0) {
crm_debug_4("Performing %s op on all nodes...", cib_action);
return the_cib->cmds->set_master(the_cib, call_options);
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/crm_resource.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- crm_resource.c 5 May 2006 12:53:35 -0000 1.24
+++ crm_resource.c 8 May 2006 07:42:17 -0000 1.25
@@ -1,4 +1,4 @@
-/* $Id: crm_resource.c,v 1.24 2006/05/05 12:53:35 andrew Exp $ */
+/* $Id: crm_resource.c,v 1.25 2006/05/08 07:42:17 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -248,7 +248,7 @@
}
/* result = cl_get_string(new_input->msg, XML_ATTR_RESULT); */
-/* if(result == NULL || strcmp(result, "ok") == 0) { */
+/* if(result == NULL || strcasecmp(result, "ok") == 0) { */
/* result = "pass"; */
/* } else { */
/* result = "fail"; */
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/crmadmin.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -3 -r1.68 -r1.69
--- crmadmin.c 26 Apr 2006 13:32:52 -0000 1.68
+++ crmadmin.c 8 May 2006 07:42:17 -0000 1.69
@@ -1,4 +1,4 @@
-/* $Id: crmadmin.c,v 1.68 2006/04/26 13:32:52 andrew Exp $ */
+/* $Id: crmadmin.c,v 1.69 2006/05/08 07:42:17 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -170,12 +170,12 @@
printf(" with arg %s", optarg);
printf("\n");
- if (strcmp("reference",
+ if (strcasecmp("reference",
long_options[option_index].name) ==
0) {
this_msg_reference =
crm_strdup(optarg);
- } else if (strcmp("die",
+ } else if (strcasecmp("die",
long_options[option_index].name) == 0) {
DO_RESET = TRUE;
crmd_operation = CRM_OP_DIE;
@@ -549,7 +549,7 @@
}
result = cl_get_string(new_input->msg, XML_ATTR_RESULT);
- if(result == NULL || strcmp(result, "ok") == 0) {
+ if(result == NULL || strcasecmp(result, "ok") == 0) {
result = "pass";
} else {
result = "fail";
------------------------------
_______________________________________________
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 14
********************************************
