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: resources by alan from
([email protected])
2. Linux-HA CVS: crm by andrew from
([email protected])
3. Linux-HA CVS: cts by andrew from
([email protected])
4. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Tue, 18 Apr 2006 14:24:01 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: resources by alan from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : alan
Host :
Project : linux-ha
Module : resources
Dir : linux-ha/resources/OCF
Modified Files:
apache.in
Log Message:
Fixed another little bug in apache related to handling missing
configuration files if they're on a disk which isn't mounted.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/apache.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- apache.in 16 Apr 2006 06:43:39 -0000 1.17
+++ apache.in 18 Apr 2006 20:24:01 -0000 1.18
@@ -546,14 +546,18 @@
esac
if
- [ ! -f "$CONFIGFILE" -a "X$COMMAND" = Xstop ]
+ [ ! -f "$CONFIGFILE" ]
then
- ocf_log warn "$CONFIGFILE not found - apache considered stopped"
- exit $OCF_SUCCESS
+ case $COMMAND in
+ stop) ocf_log warn "$CONFIGFILE not found - apache considered stopped"
+ exit $OCF_SUCCESS;;
+ monitor) exit $OCF_NOT_RUNNING;;
+ status) exit $LSB_STATUS_STOPPED;;
+ esac
fi
if
- GetParams $CONFIGFILE
+ [ "X$COMMAND" = Xmeta-data ] || GetParams $CONFIGFILE
then
: OK
else
------------------------------
Message: 2
Date: Tue, 18 Apr 2006 23:58:50 -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:
crm-1.0.dtd
Log Message:
Add the interval to lrm_rsc_op
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crm-1.0.dtd,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -3 -r1.57 -r1.58
--- crm-1.0.dtd 18 Apr 2006 11:15:37 -0000 1.57
+++ crm-1.0.dtd 19 Apr 2006 05:58:49 -0000 1.58
@@ -253,6 +253,7 @@
crm-debug-origin CDATA #IMPLIED
transition_key CDATA #IMPLIED
op_digest CDATA #IMPLIED
+ interval CDATA #REQUIRED
transition_magic CDATA #REQUIRED>
<!ELEMENT nvpair EMPTY>
------------------------------
Message: 3
Date: Wed, 19 Apr 2006 00:04:42 -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:
CTStests.py.in
Log Message:
Update the AddResource test
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cts/CTStests.py.in,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -3 -r1.142 -r1.143
--- CTStests.py.in 18 Apr 2006 16:07:22 -0000 1.142
+++ CTStests.py.in 19 Apr 2006 06:04:41 -0000 1.143
@@ -2111,7 +2111,7 @@
CTSTest.__init__(self, cm)
self.name="AddResource"
self.resource_offset = 0
- self.cib_cmd="""@libdir@/heartbeat/cibadmin -C -o %s -X '%s' """
+ self.cib_cmd="""@sbindir@/cibadmin -C -o %s -X '%s' """
def __call__(self, node):
self.resource_offset = self.resource_offset + 1
@@ -2153,10 +2153,10 @@
self.CM.log("Creating %s::%s:%s (%s) on %s" % (rclass,type,id,ip,node))
rsc_xml="""
<primitive id="%s" class="%s" type="%s" provider="heartbeat">
- <instance_attributes><attributes>
- <nvpair id="bsc-ip-1" name="ip" value="%s"/>
+ <instance_attributes id="%s"><attributes>
+ <nvpair id="%s" name="ip" value="%s"/>
</attributes></instance_attributes>
-</primitive>""" % (id, rclass, type, ip)
+</primitive>""" % (id, rclass, type, id, id, ip)
node_constraint="""
<rsc_location id="run_%s" rsc="%s">
@@ -2166,20 +2166,12 @@
</rsc_location>""" % (id, id, id, id, node)
rc = 0
- if self.CM.Env["DoBSC"]:
- rc = os.system(self.cib_cmd % ("constraint", node_constraint))
- else:
- rc = self.rsh(node, self.cib_cmd % ("constraint", node_constraint))
-
+ (rc, lines) = self.CM.rsh.remote_py(node, "os", "system", self.cib_cmd
% ("constraints", node_constraint))
if rc != 0:
self.CM.log("Constraint creation failed: %d" % rc)
return None
- if self.CM.Env["DoBSC"]:
- rc = os.system(self.cib_cmd % ("primitive", rsc_xml))
- else:
- rc = self.rsh(node, self.cib_cmd % ("primitive", rsc_xml))
-
+ (rc, lines) = self.CM.rsh.remote_py(node, "os", "system", self.cib_cmd
% ("resources", rsc_xml))
if rc != 0:
self.CM.log("Resource creation failed: %d" % rc)
return None
------------------------------
Message: 4
Date: Wed, 19 Apr 2006 00:08:43 -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:
atest.c
Log Message:
more headers
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/atest.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- atest.c 18 Apr 2006 12:19:17 -0000 1.9
+++ atest.c 19 Apr 2006 06:08:43 -0000 1.10
@@ -1,4 +1,4 @@
-/* $Id: atest.c,v 1.9 2006/04/18 12:19:17 andrew Exp $ */
+/* $Id: atest.c,v 1.10 2006/04/19 06:08:43 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -29,41 +29,9 @@
#include <errno.h>
#include <fcntl.h>
-#include <apphb.h>
-
-#include <clplumbing/ipc.h>
-#include <clplumbing/Gmain_timeout.h>
-#include <clplumbing/cl_log.h>
-#include <clplumbing/cl_signal.h>
-#include <clplumbing/lsb_exitcodes.h>
-#include <clplumbing/uids.h>
-#include <clplumbing/realtime.h>
-#include <clplumbing/GSource.h>
-#include <clplumbing/cl_poll.h>
-#include <clplumbing/coredumps.h>
-
#include <crm/crm.h>
-#include <crm/common/ctrl.h>
-#include <crm/common/ipc.h>
-#include <crm/common/xml.h>
-
-#include <crmd.h>
-#include <crmd_fsa.h>
-#include <crmd_messages.h>
-#include <crm/cib.h>
-
-#include <crm/dmalloc_wrapper.h>
-
-const char* crm_system_name = "core";
-
-gboolean process_atest_message(
- HA_Message *msg, crm_data_t *xml_data, IPC_Channel *sender);
-
-
-GMainLoop* mainloop = NULL;
#define OPTARGS "V?f:"
-#include <bzlib.h>
int
main(int argc, char ** argv)
{
------------------------------
_______________________________________________
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 95
********************************************
