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: lib by andrew from
([email protected])
3. Linux-HA CVS: cts by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Mon, 9 Jan 2006 12:24:52 -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/admin
Modified Files:
xml_diff.c
Log Message:
online help
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/xml_diff.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- xml_diff.c 22 Sep 2005 10:27:13 -0000 1.5
+++ xml_diff.c 9 Jan 2006 19:24:51 -0000 1.6
@@ -1,4 +1,4 @@
-/* $Id: xml_diff.c,v 1.5 2005/09/22 10:27:13 andrew Exp $ */
+/* $Id: xml_diff.c,v 1.6 2006/01/09 19:24:51 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -237,40 +237,17 @@
stream = exit_status != 0 ? stderr : stdout;
- fprintf(stream, "usage: %s [-?Vio] command\n"
- "\twhere necessary, XML data will be expected using -X"
- " or on STDIN if -X isnt specified\n", cmd);
+ fprintf(stream, "usage: %s [-?V] [oO] [pnN]\n", cmd);
fprintf(stream, "Options\n");
- fprintf(stream, "\t--%s (-%c) <id>\tid of the object being operated
on\n",
- XML_ATTR_ID, 'i');
- fprintf(stream, "\t--%s (-%c) <type>\tobject type being operated on\n",
- "obj_type", 'o');
- fprintf(stream, "\t--%s (-%c)\tturn on debug info."
- " additional instance increase verbosity\n", "verbose", 'V');
fprintf(stream, "\t--%s (-%c)\tthis help message\n", "help", '?');
- fprintf(stream, "\nCommands\n");
- fprintf(stream, "\t--%s (-%c)\t\n", CIB_OP_ERASE, 'E');
- fprintf(stream, "\t--%s (-%c)\t\n", CIB_OP_QUERY, 'Q');
- fprintf(stream, "\t--%s (-%c)\t\n", CIB_OP_CREATE, 'C');
- fprintf(stream, "\t--%s (-%c)\t\n", CIB_OP_REPLACE,'R');
- fprintf(stream, "\t--%s (-%c)\t\n", CIB_OP_UPDATE, 'U');
- fprintf(stream, "\t--%s (-%c)\t\n", CIB_OP_DELETE, 'D');
- fprintf(stream, "\t--%s (-%c)\t\n", CIB_OP_BUMP, 'B');
- fprintf(stream, "\t--%s (-%c)\t\n", CIB_OP_ISMASTER,'M');
- fprintf(stream, "\t--%s (-%c)\t\n", CIB_OP_SYNC, 'S');
- fprintf(stream, "\nXML data\n");
- fprintf(stream, "\t--%s (-%c) <string>\t\n", F_CRM_DATA, 'X');
- fprintf(stream, "\nAdvanced Options\n");
- fprintf(stream, "\t--%s (-%c)\tsend command to specified host."
- " Applies to %s and %s commands only\n", "host", 'h',
- CIB_OP_QUERY, CIB_OP_SYNC);
- fprintf(stream, "\t--%s (-%c)\tcommand takes effect locally"
- " on the specified host\n", "local", 'l');
- fprintf(stream, "\t--%s (-%c)\tcommand will not be broadcast even if"
- " it altered the CIB\n", "no-bcast", 'b');
- fprintf(stream, "\t--%s (-%c)\twait for call to complete before"
- " returning\n", "sync-call", 's');
+ fprintf(stream, "\t--%s (-%c) <filename>\t\n", "original", 'o');
+ fprintf(stream, "\t--%s (-%c) <filename>\t\n", "new", 'n');
+ fprintf(stream, "\t--%s (-%c) <string>\t\n", "original-string", 'O');
+ fprintf(stream, "\t--%s (-%c) <string>\t\n", "new-string", 'N');
+ fprintf(stream, "\t--%s (-%c) <filename>\tApply a patch to the original
XML\n", "patch", 'p');
+ fprintf(stream, "\t--%s (-%c)\tCompare/patch the inputs as a CIB\n",
"cib", 'c');
+ fprintf(stream, "\t--%s (-%c)\tRead the inputs from stdin\n", "stdin",
's');
fflush(stream);
------------------------------
Message: 2
Date: Mon, 9 Jan 2006 14:18:33 -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:
Fix up get_uuid() - not sure how this ever worked.
Remove log statements from the "debug level" signal handler
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/utils.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- utils.c 8 Nov 2005 06:27:38 -0000 1.29
+++ utils.c 9 Jan 2006 21:18:32 -0000 1.30
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.29 2005/11/08 06:27:38 gshi Exp $ */
+/* $Id: utils.c,v 1.30 2006/01/09 21:18:32 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -449,12 +449,10 @@
switch(nsig) {
case DEBUG_INC:
crm_log_level++;
- crm_debug("Upped log level to %d", crm_log_level);
break;
case DEBUG_DEC:
crm_log_level--;
- crm_debug("Reduced log level to %d", crm_log_level);
break;
default:
@@ -576,6 +574,7 @@
get_uuid(ll_cluster_t *hb, const char *uname)
{
char *uuid_calc = NULL;
+ cl_uuid_t uuid_raw;
if(crm_uuid_cache == NULL) {
crm_uuid_cache = g_hash_table_new_full(
@@ -593,27 +592,22 @@
crm_malloc0(uuid_calc, sizeof(char)*50);
- if(uuid_calc != NULL) {
- cl_uuid_t uuid_raw;
-
- if(hb->llc_ops->get_uuid_by_name(
- hb, uname, &uuid_raw) == HA_FAIL) {
- crm_err("Could not calculate UUID for %s", uname);
- crm_free(uuid_calc);
- uuid_calc = crm_strdup(uname);
-
- } else {
- cl_uuid_unparse(&uuid_raw, uuid_calc);
- g_hash_table_insert(
- crm_uuid_cache,
- crm_strdup(uname), uuid_calc);
- uuid_calc = g_hash_table_lookup(crm_uuid_cache, uname);
- }
- return uuid_calc;
+ if(uuid_calc == NULL) {
+ return NULL;
}
- crm_free(uuid_calc);
- return NULL;
+ if(hb->llc_ops->get_uuid_by_name(hb, uname, &uuid_raw) == HA_FAIL) {
+ crm_err("Could not calculate UUID for %s", uname);
+ crm_free(uuid_calc);
+ uuid_calc = crm_strdup(uname);
+
+ } else {
+ cl_uuid_unparse(&uuid_raw, uuid_calc);
+ g_hash_table_insert(
+ crm_uuid_cache, crm_strdup(uname), uuid_calc);
+ uuid_calc = g_hash_table_lookup(crm_uuid_cache, uname);
+ }
+ return uuid_calc;
}
const char *
@@ -635,7 +629,7 @@
return uname;
}
- if(uname != NULL) {
+ if(uuid != NULL) {
cl_uuid_t uuid_raw;
char *uuid_copy = crm_strdup(uuid);
cl_uuid_parse(uuid_copy, &uuid_raw);
------------------------------
Message: 3
Date: Mon, 9 Jan 2006 14:19:10 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: cts by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : cts
Dir : linux-ha/cts
Modified Files:
CTSaudits.py.in
Log Message:
usual 1 char per line thing
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cts/CTSaudits.py.in,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- CTSaudits.py.in 7 Jan 2006 21:21:51 -0000 1.40
+++ CTSaudits.py.in 9 Jan 2006 21:19:09 -0000 1.41
@@ -295,12 +295,11 @@
passed = 0
if not RunningNodes:
self.CM.log("Not all resources in group %s running on
same node" % repr(group))
- self.CM.log(" %s not running" % rsc.rid)
+ self.CM.log("* %s not running" % rsc.rid)
else:
- self.CM.log("Not all resources in group %s running on
same node"%
- repr(group))
- self.CM.log(" %s running on %s"%(group[0].rid,
NodeofRsc[group[0].rid]))
- self.CM.log(" %s running on %s"%(rsc.rid,
NodeofRsc[rsc.rid]))
+ self.CM.log("Not all resources in group %s running on
same node"% repr(group))
+ self.CM.log("* %s running on %s"%(group[0].rid,
repr(NodeofRsc[group[0].rid])))
+ self.CM.log("* %s running on %s"%(rsc.rid,
repr(NodeofRsc[rsc.rid])))
#Make sure the resouces with "must","placement" constraint are running
on the same node
Dependancies = self.CM.Dependencies()
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 26, Issue 9
*******************************************
