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: tools by andrew from
([email protected])
2. Linux-HA CVS: tools 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])
5. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Sun, 9 Apr 2006 10:54:29 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: tools by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : tools
Dir : linux-ha/tools
Modified Files:
attrd.c
Log Message:
Mask delete "failures"
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/tools/attrd.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- attrd.c 9 Apr 2006 12:50:04 -0000 1.1
+++ attrd.c 9 Apr 2006 16:54:28 -0000 1.2
@@ -1,4 +1,4 @@
-/* $Id: attrd.c,v 1.1 2006/04/09 12:50:04 andrew Exp $ */
+/* $Id: attrd.c,v 1.2 2006/04/09 16:54:28 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -456,6 +456,9 @@
rc = delete_attr(cib_conn, section, attrd_uuid, set,
NULL, attr, NULL);
+ if(rc == cib_NOTEXISTS) {
+ rc = cib_ok;
+ }
} else if(hash_entry->value == NULL) {
/* delete the attr */
@@ -463,6 +466,9 @@
attr, hash_entry->set, hash_entry->section);
rc = delete_attr(cib_conn, hash_entry->section, attrd_uuid,
hash_entry->set, NULL, attr, NULL);
+ if(rc == cib_NOTEXISTS) {
+ rc = cib_ok;
+ }
} else {
/* send update */
------------------------------
Message: 2
Date: Sun, 9 Apr 2006 10:54:51 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: tools by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : tools
Dir : linux-ha/tools
Modified Files:
attrd_updater.c
Log Message:
Logging to stderr and help text
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/tools/attrd_updater.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- attrd_updater.c 9 Apr 2006 12:50:04 -0000 1.1
+++ attrd_updater.c 9 Apr 2006 16:54:51 -0000 1.2
@@ -1,4 +1,4 @@
-/* $Id: attrd_updater.c,v 1.1 2006/04/09 12:50:04 andrew Exp $ */
+/* $Id: attrd_updater.c,v 1.2 2006/04/09 16:54:51 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -108,7 +108,7 @@
(void*)process_attrd_message, &attrd);
if(attrd == NULL) {
- crm_err("Could not connect to "T_ATTRD);
+ fprintf(stderr, "Could not connect to "T_ATTRD);
return 1;
}
@@ -131,7 +131,7 @@
}
if(send_ipc_message(attrd, update) == FALSE) {
- crm_err("Update failed");
+ fprintf(stderr, "Could not send update");
return 1;
}
return 0;
@@ -144,13 +144,13 @@
stream = exit_status ? stderr : stdout;
- fprintf(stream, "usage: %s [-srkh]"
- "[-c configure file]\n", cmd);
-/* fprintf(stream, "\t-d\tsets debug level\n"); */
-/* fprintf(stream, "\t-s\tgets daemon status\n"); */
-/* fprintf(stream, "\t-r\trestarts daemon\n"); */
-/* fprintf(stream, "\t-k\tstops daemon\n"); */
-/* fprintf(stream, "\t-h\thelp message\n"); */
+ fprintf(stream, "usage: %s -n [-vdsS]\n", cmd);
+ fprintf(stream, "\t-n <string>\tthe attribute that changed\n");
+ fprintf(stream, "\t-v <string>\tthe attribute's value\n");
+ fprintf(stream, "\t\tIf no value is supplied, the attribute value for
this node will be deleted\n");
+ fprintf(stream, "\t-d <string>\tthe time to delay in case further
cahnges occur\n");
+ fprintf(stream, "\t-s <string>\tthe attribute set in which to place the
value\n");
+ fprintf(stream, "\t-S <string>\tthe section in which to place the
value\n");
fflush(stream);
exit(exit_status);
------------------------------
Message: 3
Date: Sun, 9 Apr 2006 11:01:15 -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:
Makefile.am
Log Message:
Make sure the DTD is part of the tarball
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/Makefile.am,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- Makefile.am 5 Apr 2006 10:06:23 -0000 1.16
+++ Makefile.am 9 Apr 2006 17:01:15 -0000 1.17
@@ -26,6 +26,7 @@
crm_varrundir = $(HA_VARRUNDIR)/$(HB_PKG)/crm
noinst_HEADERS = dmalloc_wrapper.h
+DIST_SOURCES = crm-1.0.dtd
dtd_SCRIPTS = crm.dtd
crm.dtd: crm-1.0.dtd
------------------------------
Message: 4
Date: Sun, 9 Apr 2006 11:01:58 -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:
lrm.c
Log Message:
Allow update_attr() to set its defaults
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/lrm.c,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -3 -r1.182 -r1.183
--- lrm.c 9 Apr 2006 14:49:33 -0000 1.182
+++ lrm.c 9 Apr 2006 17:01:58 -0000 1.183
@@ -798,18 +798,13 @@
} else if(safe_str_eq(operation, CRM_OP_PROBED)
|| safe_str_eq(crm_op, CRM_OP_REPROBE)) {
- char *attr_id = crm_concat("lrm-probe", fsa_our_uuid, '-');
- char *attr_set = crm_concat("crmd-transient", fsa_our_uuid,'-');
const char *probed = XML_BOOLEAN_TRUE;
if(safe_str_eq(crm_op, CRM_OP_REPROBE)) {
probed = XML_BOOLEAN_FALSE;
}
- update_attr(fsa_cib_conn, cib_none, XML_CIB_TAG_STATUS,
fsa_our_uuid,
- attr_set, attr_id, CRM_OP_PROBED, probed);
-
- crm_free(attr_id);
- crm_free(attr_set);
+ update_attr(fsa_cib_conn, cib_none, XML_CIB_TAG_STATUS,
+ fsa_our_uuid, NULL, NULL, CRM_OP_PROBED, probed);
} else if(operation != NULL) {
char rid[64];
------------------------------
Message: 5
Date: Sun, 9 Apr 2006 11:01:58 -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/tengine
Modified Files:
events.c
Log Message:
Allow update_attr() to set its defaults
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/events.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- events.c 4 Apr 2006 13:05:44 -0000 1.10
+++ events.c 9 Apr 2006 17:01:58 -0000 1.11
@@ -1,4 +1,4 @@
-/* $Id: events.c,v 1.10 2006/04/04 13:05:44 andrew Exp $ */
+/* $Id: events.c,v 1.11 2006/04/09 17:01:58 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -164,9 +164,7 @@
static void
update_failcount(crm_action_t *action, int rc)
{
- char *attr_set = NULL;
char *attr_name = NULL;
- char *attr_id = NULL;
const char *task = NULL;
const char *rsc_id = NULL;
@@ -196,18 +194,13 @@
CRM_CHECK(on_uuid != NULL, return);
CRM_CHECK(on_node != NULL, return);
- attr_set = crm_concat("crmd-transient", on_uuid, '-');
attr_name = crm_concat("fail-count", rsc_id, '-');
- attr_id = crm_concat(attr_name, on_uuid, '-');
crm_warn("Updating failcount for %s on %s after failed %s: rc=%d",
rsc_id, on_node, task, rc);
update_attr(te_cib_conn, cib_none, XML_CIB_TAG_STATUS,
- on_uuid, attr_set, attr_id, attr_name,
- XML_NVPAIR_ATTR_VALUE"++");
+ on_uuid, NULL,NULL, attr_name, XML_NVPAIR_ATTR_VALUE"++");
- crm_free(attr_id);
- crm_free(attr_set);
crm_free(attr_name);
}
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 29, Issue 48
********************************************
