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: cts by andrew from
([email protected])
2. Linux-HA CVS: crm by andrew from
([email protected])
3. Linux-HA CVS: linux-ha by andrew from
([email protected])
4. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Tue, 2 May 2006 04:02:04 -0600 (MDT)
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:
CTSlab.py.in
Log Message:
Dont use ssh if running locally
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cts/CTSlab.py.in,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -3 -r1.63 -r1.64
--- CTSlab.py.in 21 Apr 2006 16:04:34 -0000 1.63
+++ CTSlab.py.in 2 May 2006 10:02:04 -0000 1.64
@@ -745,10 +745,12 @@
cm.log("Resource Monitoring is disabled")
cm.log("Cluster nodes: ")
for node in config.Parameters["node"]:
- out=cm.rsh.readaline(node, "@sbindir@/crm_uuid")
- if not out:
+ (rc, lines) = cm.rsh.remote_py(node, "os", "system",
+ "@sbindir@/crm_uuid")
+ if not lines:
cm.log(" * %s: __undefined_uuid__" % node)
else:
+ out=lines[0]
out = out[:-1]
cm.log(" * %s: %s" % (node, out))
------------------------------
Message: 2
Date: Tue, 2 May 2006 04:03:40 -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:
master.c
Log Message:
We need the promoted/demoted actions to run so the notifications can
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/master.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- master.c 18 Apr 2006 11:19:42 -0000 1.14
+++ master.c 2 May 2006 10:03:40 -0000 1.15
@@ -1,4 +1,4 @@
-/* $Id: master.c,v 1.14 2006/04/18 11:19:42 andrew Exp $ */
+/* $Id: master.c,v 1.15 2006/05/02 10:03:40 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -421,6 +421,7 @@
action->pseudo = TRUE;
action_complete->pseudo = TRUE;
+ action_complete->priority = INFINITY;
child_promoting_constraints(clone_data, pe_ordering_optional,
NULL, last_promote_rsc, data_set);
@@ -433,6 +434,7 @@
action_complete = custom_action(
clone_data->self, demoted_key(rsc),
CRMD_ACTION_DEMOTED, NULL, !any_demoting, TRUE, data_set);
+ action_complete->priority = INFINITY;
action->pseudo = TRUE;
action_complete->pseudo = TRUE;
------------------------------
Message: 3
Date: Tue, 2 May 2006 04:09:13 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
bootstrap
Log Message:
Improve on Matt's bootstrap changes
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/bootstrap,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- bootstrap 28 Apr 2006 18:57:57 -0000 1.24
+++ bootstrap 2 May 2006 10:09:13 -0000 1.25
@@ -29,15 +29,32 @@
return 0;
fi
- cmd=""
+ cmd=`which -s $1`
+ if [ ! -f "$cmd" ]; then
+ return 1
+ fi
+
arch=`uname -s`
- if [ "$arch" = "Linux" ]
+ # On some systems we have to make do with the presence of the command
+ if [ "$arch" != "Linux" -a "$arch" != "Darwin" ]; then
+ return 0;
+ fi
+
+ # The GNU standard is --version
+ if
+ $cmd --version </dev/null >/dev/null 2>&1
+ then
+ return 0
+ fi
+
+ # Fall back to -V
+ if
+ $cmd -V </dev/null >/dev/null 2>&1
then
- cmd="$1 --version </dev/null >/dev/null 2>&1"
- else
- cmd="which -s $1"
+ return 0
fi
+ return 1
}
srcdir=`dirname $0`
@@ -76,9 +93,8 @@
URL=$gnu/$pkg/
for command in autoconf autoconf213 autoconf253 autoconf259
do
- testProgram $command
if
- $cmd >/dev/null 2>&1
+ testProgram $command
then
: OK $pkg is installed
autoconf=$command
@@ -111,9 +127,8 @@
URL=$gnu/$pkg/
for command in automake automake14 automake15 automake19
do
- testProgram $command
if
- $cmd >/dev/null 2>&1
+ testProgram $command
then
: OK $pkg is installed
automake=$command
@@ -142,9 +157,8 @@
for command in libtool libtool14 libtool15 glibtool
do
URL=$gnu/$pkg/
- testProgram $command
if
- $cmd >/dev/null 2>&1
+ testProgram $command
then
: OK $pkg is installed
libtool=$command
------------------------------
Message: 4
Date: Tue, 2 May 2006 04:10:59 -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
Log Message:
Update the usage and remove --id since it was ignored
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/cibadmin.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -3 -r1.49 -r1.50
--- cibadmin.c 3 Apr 2006 16:10:59 -0000 1.49
+++ cibadmin.c 2 May 2006 10:10:58 -0000 1.50
@@ -1,4 +1,4 @@
-/* $Id: cibadmin.c,v 1.49 2006/04/03 16:10:59 andrew Exp $ */
+/* $Id: cibadmin.c,v 1.50 2006/05/02 10:10:58 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -78,7 +78,6 @@
struct str_list_s *next;
} str_list_t;
-char *id = NULL;
char *this_msg_reference = NULL;
char *obj_type = NULL;
char *status = NULL;
@@ -91,7 +90,7 @@
int operation_status = 0;
cib_t *the_cib = NULL;
-#define OPTARGS "V?i:o:QDUCEX:t:Srwlsh:MmBfbdRx:p"
+#define OPTARGS "V?o:QDUCEX:t:Srwlsh:MmBfbdRx:p"
int
main(int argc, char **argv)
@@ -129,14 +128,13 @@
{"host", 0, 0, 'h'},
{F_CRM_DATA, 1, 0, 'X'},
{"xml-file", 1, 0, 'x'},
- {"xml-pipe",0 , 0, 'p'},
+ {"xml-pipe", 0, 0, 'p'},
{"verbose", 0, 0, 'V'},
{"help", 0, 0, '?'},
{"reference", 1, 0, 0},
{"timeout", 1, 0, 't'},
/* common options */
- {XML_ATTR_ID, 1, 0, 'i'},
{"obj_type", 1, 0, 'o'},
{0, 0, 0, 0}
@@ -235,10 +233,6 @@
case '?':
usage(crm_system_name, LSB_EXIT_OK);
break;
- case 'i':
- crm_debug_2("Option %c => %s", flag, optarg);
- id = crm_strdup(optarg);
- break;
case 'o':
crm_debug_2("Option %c => %s", flag, optarg);
obj_type = crm_strdup(optarg);
@@ -438,8 +432,6 @@
" -x, or -p options\n", cmd, OPTARGS);
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\tValid values are: nodes, resources, status,
constraints\n");
@@ -452,7 +444,7 @@
fprintf(stream, "\t--%s (-%c)\t\n", CIB_OP_CREATE, 'C');
fprintf(stream, "\t--%s (-%c)\tRecursivly replace an object in the
CIB\n", CIB_OP_REPLACE,'R');
fprintf(stream, "\t--%s (-%c)\tRecursivly update an object in the
CIB\n", CIB_OP_UPDATE, 'U');
- fprintf(stream, "\t--%s (-%c)\tUpdate the attributes of an object in
the CIB\n", CIB_OP_MODIFY, 'M');
+ fprintf(stream, "\t--%s (-%c)\tFind the object somewhere in the CIB's
XML tree and update is as --"CIB_OP_UPDATE" would\n", CIB_OP_MODIFY, 'M');
fprintf(stream, "\t--%s (-%c)\t\n", CIB_OP_DELETE, 'D');
fprintf(stream, "\t\t\tDelete the first object matching the supplied
criteria\n");
fprintf(stream, "\t\t\tEg. <op id=\"rsc1_op1\" name=\"monitor\"/>\n");
------------------------------
_______________________________________________
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 4
*******************************************
