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: resources by lars from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Thu, 26 Jan 2006 10:09:59 -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/cib
Modified Files:
callbacks.c
Log Message:
Dubass fix - peer messages never have the sync option forced
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/callbacks.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -3 -r1.100 -r1.101
--- callbacks.c 26 Jan 2006 10:24:06 -0000 1.100
+++ callbacks.c 26 Jan 2006 17:09:58 -0000 1.101
@@ -1,4 +1,4 @@
-/* $Id: callbacks.c,v 1.100 2006/01/26 10:24:06 andrew Exp $ */
+/* $Id: callbacks.c,v 1.101 2006/01/26 17:09:58 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -728,7 +728,7 @@
const char *client_id = client_obj->callback_id;
crm_debug_2("Sending %ssync response to %s %s",
(call_options & cib_sync_call)?"":"an a-",
- client_obj->id,
+ client_obj->name,
from_peer?"(originator of delegated
request)":"");
if(call_options & cib_sync_call) {
@@ -1313,7 +1313,7 @@
ha_msg_value_int(msg, F_CIB_CALLOPTS, &call_options);
crm_debug_4("Retrieved call options: %d", call_options);
- cib_process_request(msg, call_options, TRUE, TRUE, NULL);
+ cib_process_request(msg, FALSE, TRUE, TRUE, NULL);
return;
}
------------------------------
Message: 2
Date: Thu, 26 Jan 2006 11:00:06 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: resources by lars from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : lars
Host :
Project : linux-ha
Module : resources
Dir : linux-ha/resources/OCF
Modified Files:
Filesystem.in ICP.in LVM.in LinuxSCSI.in Raid1.in ServeRAID.in
WAS.in db2.in
Log Message:
Some here documents weren't using the proper tokens (and confused my
syntax highlighting); also, redirecting to stdout is redundant.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/Filesystem.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- Filesystem.in 12 Jan 2006 16:41:12 -0000 1.13
+++ Filesystem.in 26 Jan 2006 18:00:05 -0000 1.14
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: Filesystem.in,v 1.13 2006/01/12 16:41:12 xunsun Exp $
+# $Id: Filesystem.in,v 1.14 2006/01/26 18:00:05 lars Exp $
#
# Support: [EMAIL PROTECTED]
# License: GNU General Public License (GPL)
@@ -93,10 +93,9 @@
}
usage() {
-
-cat <<-EOT;
+ cat <<-EOT
usage: $0 {start|stop|status|monitor|validate-all|meta-data}
- $Id: Filesystem.in,v 1.13 2006/01/12 16:41:12 xunsun Exp $
+ $Id: Filesystem.in,v 1.14 2006/01/26 18:00:05 lars Exp $
EOT
}
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/ICP.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ICP.in 20 Dec 2005 08:34:47 -0000 1.4
+++ ICP.in 26 Jan 2006 18:00:05 -0000 1.5
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: ICP.in,v 1.4 2005/12/20 08:34:47 zhenh Exp $
+# $Id: ICP.in,v 1.5 2006/01/26 18:00:05 lars Exp $
#
# ICP
#
@@ -41,7 +41,7 @@
usage() {
methods=`ICP_methods | grep -v methods`
methods=`echo $methods | tr ' ' '|'`
- cat <<-! >&1
+ cat <<-!
usage: $0 ($methods)
$0 manages an ICP Vortex clustered host drive.
@@ -53,7 +53,7 @@
The 'validate-all' operation reports whether OCF instance parameters
are valid.
The 'methods' operation reports on the methods $0 supports
- $Id: ICP.in,v 1.4 2005/12/20 08:34:47 zhenh Exp $
+ $Id: ICP.in,v 1.5 2006/01/26 18:00:05 lars Exp $
!
}
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/LVM.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- LVM.in 20 Dec 2005 08:34:47 -0000 1.9
+++ LVM.in 26 Jan 2006 18:00:05 -0000 1.10
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: LVM.in,v 1.9 2005/12/20 08:34:47 zhenh Exp $
+# $Id: LVM.in,v 1.10 2006/01/26 18:00:05 lars Exp $
#
# LVM
#
@@ -36,7 +36,7 @@
usage() {
methods=`LVM_methods`
methods=`echo $methods | tr ' ' '|'`
- cat <<-! >&1
+ cat <<-!
usage: $0 $methods
$0 manages an Linux Volume Manager volume (LVM) as an HA resource
@@ -48,7 +48,7 @@
The 'validate-all' operation checks whether the OCF parameters are valid
The 'methods' operation reports on the methods $0 supports
- $Id: LVM.in,v 1.9 2005/12/20 08:34:47 zhenh Exp $
+ $Id: LVM.in,v 1.10 2006/01/26 18:00:05 lars Exp $
!
exit $OCF_ERR_GENERIC
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/LinuxSCSI.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- LinuxSCSI.in 20 Dec 2005 08:34:47 -0000 1.6
+++ LinuxSCSI.in 26 Jan 2006 18:00:05 -0000 1.7
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: LinuxSCSI.in,v 1.6 2005/12/20 08:34:47 zhenh Exp $
+# $Id: LinuxSCSI.in,v 1.7 2006/01/26 18:00:05 lars Exp $
#
# LinuxSCSI
#
@@ -36,7 +36,7 @@
PROCSCSI=/proc/scsi/scsi
usage() {
- cat <<-! >&1
+ cat <<-!
usage: $0 (start|stop|status|monitor|meta-data|validate-all|methods)
$0 manages the availability of a SCSI device from the point
@@ -98,7 +98,7 @@
keep in the volumes. If you don't use a reasonable volume manager,
then you'll have to mount by UUID.
- $Id: LinuxSCSI.in,v 1.6 2005/12/20 08:34:47 zhenh Exp $
+ $Id: LinuxSCSI.in,v 1.7 2006/01/26 18:00:05 lars Exp $
!
}
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/Raid1.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- Raid1.in 21 Dec 2005 05:36:52 -0000 1.6
+++ Raid1.in 26 Jan 2006 18:00:05 -0000 1.7
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: Raid1.in,v 1.6 2005/12/21 05:36:52 zhenh Exp $
+# $Id: Raid1.in,v 1.7 2006/01/26 18:00:05 lars Exp $
#
# License: GNU General Public License (GPL)
# Support: [EMAIL PROTECTED]
@@ -111,10 +111,10 @@
}
usage() {
-cat <<-EOT;
+ cat <<-EOT
usage: $0 {start|stop|status|monitor|validate-all|usage|meta-data}
- $Id: Raid1.in,v 1.6 2005/12/21 05:36:52 zhenh Exp $
-EOT
+ $Id: Raid1.in,v 1.7 2006/01/26 18:00:05 lars Exp $
+ EOT
}
meta_data() {
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/ServeRAID.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ServeRAID.in 20 Dec 2005 08:34:47 -0000 1.7
+++ ServeRAID.in 26 Jan 2006 18:00:05 -0000 1.8
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: ServeRAID.in,v 1.7 2005/12/20 08:34:47 zhenh Exp $
+# $Id: ServeRAID.in,v 1.8 2006/01/26 18:00:05 lars Exp $
#
# ServeRAID
#
@@ -76,7 +76,7 @@
SCSI="scsi "
usage() {
- cat <<-! >&1
+ cat <<-!
usage: $0 (start|stop|status|monitor|validate-all|meta-data)
You have to set the following environment virables before running $0 :
@@ -104,7 +104,7 @@
You will need at least version 6.10 (~July 2003 release) of the ipssend
command for this script to work.
- $Id: ServeRAID.in,v 1.7 2005/12/20 08:34:47 zhenh Exp $
+ $Id: ServeRAID.in,v 1.8 2006/01/26 18:00:05 lars Exp $
!
}
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/WAS.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- WAS.in 20 Dec 2005 08:34:47 -0000 1.7
+++ WAS.in 26 Jan 2006 18:00:05 -0000 1.8
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: WAS.in,v 1.7 2005/12/20 08:34:47 zhenh Exp $
+# $Id: WAS.in,v 1.8 2006/01/26 18:00:05 lars Exp $
#
# WAS
#
@@ -51,7 +51,7 @@
usage() {
methods=`WAS_methods | grep -v methods`
methods=`echo $methods | tr ' ' '|'`
- cat <<-! >&1
+ cat <<-!
usage: $0 ($methods)
For the single server edition of WAS, you have to set the following
@@ -99,7 +99,7 @@
We run servlet/snoop on the first transport port listed in
the config file for the "monitor" operation.
- $Id: WAS.in,v 1.7 2005/12/20 08:34:47 zhenh Exp $
+ $Id: WAS.in,v 1.8 2006/01/26 18:00:05 lars Exp $
!
}
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/db2.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- db2.in 20 Dec 2005 08:34:48 -0000 1.7
+++ db2.in 26 Jan 2006 18:00:05 -0000 1.8
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: db2.in,v 1.7 2005/12/20 08:34:48 zhenh Exp $
+# $Id: db2.in,v 1.8 2006/01/26 18:00:05 lars Exp $
#
# db2
#
@@ -36,7 +36,7 @@
usage() {
methods=`db2_methods`
methods=`echo $methods | tr ' ' '|'`
- cat <<-! >&1
+ cat <<-!
usage: $0 ($methods)
$0 manages a DB2 Universal Database instance as an HA resource.
@@ -48,7 +48,7 @@
The 'validate-all' operation reports whether the parameters are valid
The 'methods' operation reports on the methods $0 supports
- $Id: db2.in,v 1.7 2005/12/20 08:34:48 zhenh Exp $
+ $Id: db2.in,v 1.8 2006/01/26 18:00:05 lars Exp $
!
}
------------------------------
_______________________________________________
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 61
********************************************
