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: lib by gshi from ([email protected])
2. Linux-HA CVS: lib by gshi from ([email protected])
3. Linux-HA CVS: membership by gshi from
([email protected])
4. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Thu, 15 Dec 2005 19:12:01 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by gshi from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : gshi
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/plugins/quorum
Modified Files:
Makefile.am
Added Files:
majority.c
Removed Files:
classic.c
Log Message:
add an entry "env" to tell heartbeat to set environment variable
change classic.c quorum module to majority.c
change grant.c tiebreaker module to twonodes.c
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/plugins/quorum/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Makefile.am 9 Dec 2005 20:15:31 -0000 1.1
+++ Makefile.am 16 Dec 2005 02:12:00 -0000 1.2
@@ -33,8 +33,8 @@
halibdir = $(libdir)/@HB_PKG@
plugindir = $(halibdir)/plugins/quorum
-plugin_LTLIBRARIES = classic.la
+plugin_LTLIBRARIES = majority.la
-classic_la_SOURCES = classic.c
-classic_la_LDFLAGS = -export-dynamic -module -avoid-version -lz
-classic_la_LIBADD = $(top_builddir)/replace/libreplace.la
+majority_la_SOURCES = majority.c
+majority_la_LDFLAGS = -export-dynamic -module -avoid-version -lz
+majority_la_LIBADD = $(top_builddir)/replace/libreplace.la
------------------------------
Message: 2
Date: Thu, 15 Dec 2005 19:12:00 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by gshi from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : gshi
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/plugins/tiebreaker
Modified Files:
Makefile.am
Added Files:
twonodes.c
Removed Files:
grant.c
Log Message:
add an entry "env" to tell heartbeat to set environment variable
change classic.c quorum module to majority.c
change grant.c tiebreaker module to twonodes.c
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/plugins/tiebreaker/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Makefile.am 9 Dec 2005 20:15:31 -0000 1.1
+++ Makefile.am 16 Dec 2005 02:12:00 -0000 1.2
@@ -33,8 +33,8 @@
halibdir = $(libdir)/@HB_PKG@
plugindir = $(halibdir)/plugins/tiebreaker
-plugin_LTLIBRARIES = grant.la
+plugin_LTLIBRARIES = twonodes.la
-grant_la_SOURCES = grant.c
-grant_la_LDFLAGS = -export-dynamic -module -avoid-version -lz
-grant_la_LIBADD = $(top_builddir)/replace/libreplace.la
+twonodes_la_SOURCES = twonodes.c
+twonodes_la_LDFLAGS = -export-dynamic -module -avoid-version -lz
+twonodes_la_LIBADD = $(top_builddir)/replace/libreplace.la
------------------------------
Message: 3
Date: Thu, 15 Dec 2005 19:12:01 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: membership by gshi from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : gshi
Host :
Project : linux-ha
Module : membership
Dir : linux-ha/membership/ccm
Modified Files:
ccmclient.c
Log Message:
add an entry "env" to tell heartbeat to set environment variable
change classic.c quorum module to majority.c
change grant.c tiebreaker module to twonodes.c
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/membership/ccm/ccmclient.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- ccmclient.c 9 Dec 2005 20:15:31 -0000 1.32
+++ ccmclient.c 16 Dec 2005 02:12:00 -0000 1.33
@@ -1,4 +1,4 @@
-/* $Id: ccmclient.c,v 1.32 2005/12/09 20:15:31 gshi Exp $ */
+/* $Id: ccmclient.c,v 1.33 2005/12/16 02:12:00 gshi Exp $ */
/*
* client.c: Consensus Cluster Client tracker
*
@@ -26,6 +26,7 @@
#include <clplumbing/cl_plugin.h>
#include <clplumbing/cl_quorum.h>
#include <clplumbing/cl_tiebreaker.h>
+#include <clplumbing/cl_misc.h>
typedef struct ccm_client_s {
int ccm_clid;
@@ -339,15 +340,37 @@
}
+#define QUORUM_S "HA_quorum"
+#define TIEBREAKER_S "HA_tiebreaker"
+
static gboolean
get_quorum(ccm_info_t* info)
{
static struct hb_quorum_fns* funcs = NULL;
static struct hb_tiebreaker_fns* tiebreaker_funcs = NULL;
- const char* quorum_plugin = "classic";
+ const char* quorum_plugin = NULL;
const char* tiebreaker_plugin = NULL;
int rc;
-
+
+ if (funcs == NULL){
+ quorum_plugin = cl_get_env(QUORUM_S);
+ if (quorum_plugin == NULL){
+ cl_log(LOG_INFO, "No quorum selected,"
+ "using default quorum plugin(majority)");
+ quorum_plugin = "majority";
+ }
+ }
+
+ if (tiebreaker_funcs == NULL){
+ tiebreaker_plugin = cl_get_env(TIEBREAKER_S);
+ if (tiebreaker_plugin == NULL){
+ cl_log(LOG_INFO, "No tiebreaker selected,"
+ "using default tiebreaker plugin(twonodes)");
+ tiebreaker_plugin = "twonodes";
+ }
+
+ }
+
if (funcs == NULL){
funcs = cl_load_plugin("quorum", quorum_plugin);
if (funcs == NULL){
------------------------------
Message: 4
Date: Fri, 16 Dec 2005 07:55:14 -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:
cibadmin.c
Log Message:
Fix up the help text
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/cibadmin.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- cibadmin.c 2 Nov 2005 16:33:24 -0000 1.45
+++ cibadmin.c 16 Dec 2005 14:55:12 -0000 1.46
@@ -1,4 +1,4 @@
-/* $Id: cibadmin.c,v 1.45 2005/11/02 16:33:24 andrew Exp $ */
+/* $Id: cibadmin.c,v 1.46 2005/12/16 14:55:12 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -525,12 +525,12 @@
" 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)\tErase the contents of the whole CIB\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)\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)\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");
@@ -542,7 +542,7 @@
fprintf(stream, "\t\t\tRequires -o\n");
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_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\tRetrieve XML from the
supplied string\n", F_CRM_DATA, 'X');
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 25, Issue 37
********************************************
