From: "Fabio M. Di Nitto" <fdinitto@xxxxxxxxxx>
Signed-off-by: Fabio M. Di Nitto <fdinitto@xxxxxxxxxx>
---
:100644 100644 24d2c0f... cda0b25... M man/corosync-quorumtool.8
:100644 100644 e0a0b48... ec50c9b... M man/corosync.conf.5
:100644 100644 b680c7a... a43a1e3... M man/votequorum_overview.8
man/corosync-quorumtool.8 | 9 ++++++---
man/corosync.conf.5 | 17 +++++++++++++++--
man/votequorum_overview.8 | 39 ++++++++++++++++++++++++++-------------
3 files changed, 47 insertions(+), 18 deletions(-)
diff --git a/man/corosync-quorumtool.8 b/man/corosync-quorumtool.8
index 24d2c0f..cda0b25 100644
--- a/man/corosync-quorumtool.8
+++ b/man/corosync-quorumtool.8
@@ -1,5 +1,5 @@
.\"/*
-.\" * Copyright (C) 2010 Red Hat, Inc.
+.\" * Copyright (C) 2010,2012 Red Hat, Inc.
.\" *
.\" * All rights reserved.
.\" *
@@ -31,11 +31,11 @@
.\" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
.\" * THE POSSIBILITY OF SUCH DAMAGE.
.\" */
-.TH COROSYNC-QUORUMTOOL 8 2010-05-30
+.TH COROSYNC-QUORUMTOOL 8 2012-01-12
.SH NAME
corosync-quorumtool \- Set and display quorum settings.
.SH SYNOPSIS
-.B "corosync-quorumtool [\-s] [\-l] [\-v votes] [\-n nodeid] [\-e expected] [\-h] [\-i]"
+.B "corosync-quorumtool [\-s] [\-m] [\-l] [\-v votes] [\-n nodeid] [\-e expected] [\-h] [\-i]"
.SH DESCRIPTION
Display the current state of quorum in the cluster and set vote quorum options.
.SH OPTIONS
@@ -43,6 +43,9 @@ Display the current state of quorum in the cluster and set vote quorum options.
.B -s
show quorum status
.TP
+.B -m
+constantly monitor quorum status
+.TP
.B -l
list nodes
.TP
diff --git a/man/corosync.conf.5 b/man/corosync.conf.5
index e0a0b48..ec50c9b 100644
--- a/man/corosync.conf.5
+++ b/man/corosync.conf.5
@@ -1,6 +1,6 @@
.\"/*
.\" * Copyright (c) 2005 MontaVista Software, Inc.
-.\" * Copyright (c) 2006-2011 Red Hat, Inc.
+.\" * Copyright (c) 2006-2012 Red Hat, Inc.
.\" *
.\" * All rights reserved.
.\" *
@@ -32,7 +32,7 @@
.\" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
.\" * THE POSSIBILITY OF SUCH DAMAGE.
.\" */
-.TH COROSYNC_CONF 5 2011-12-16 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual"
+.TH COROSYNC_CONF 5 2012-01-12 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual"
.SH NAME
corosync.conf - corosync executive configuration file
@@ -51,6 +51,9 @@ This top level directive contains configuration options for the totem protocol.
.TP
logging { }
This top level directive contains configuration options for logging.
+.TP
+quorum { }
+This top level directive contains configuration options for quorum.
.PP
.PP
@@ -608,6 +611,16 @@ This specifies the subsystem identity (name) for which logging is specified. Thi
name used by a service in the log_init () call. E.g. 'CPG'. This directive is
required.
+.PP
+Within the
+.B quorum
+directive it is possible to specify the quorum algorithm to use with the
+
+.TP
+provider
+directive. At the time of writing only corosync_votequorum is supported. Please refer
+to quorum modules man pages (8) for specific config options.
+
.SH "FILES"
.TP
/etc/corosync/corosync.conf
diff --git a/man/votequorum_overview.8 b/man/votequorum_overview.8
index b680c7a..a43a1e3 100644
--- a/man/votequorum_overview.8
+++ b/man/votequorum_overview.8
@@ -1,9 +1,10 @@
.\"/*
-.\" * Copyright (c) 2008 Red Hat, Inc.
+.\" * Copyright (c) 2008, 2012 Red Hat, Inc.
.\" *
.\" * All rights reserved.
.\" *
-.\" * Author: Christine Caulfield <ccaulfie@xxxxxxxxxx>
+.\" * Authors: Christine Caulfield <ccaulfie@xxxxxxxxxx>
+.\" * Fabio M. Di Nitto <fdinitto@xxxxxxxxxx>
.\" *
.\" * This software licensed under BSD license, the text of which follows:
.\" *
@@ -31,7 +32,7 @@
.\" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
.\" * THE POSSIBILITY OF SUCH DAMAGE.
.\" */
-.TH VOTEQUORUM_OVERVIEW 8 2009-01-26 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual"
+.TH VOTEQUORUM_OVERVIEW 8 2012-01-12 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual"
.SH NAME
votequorum_overview \- Votequorum Library Overview
.SH OVERVIEW
@@ -56,7 +57,7 @@ The library provides a mechanism to:
* Connect an additional quorum device to allow small clusters to remain quorate during node outages.
.PP
.B votequorum
-reads its configuration from the objdb. The following keys are read when it starts up:
+reads its configuration from internal cmap database. The following keys are read when it starts up:
.PP
* quorum.expected_votes
.br
@@ -65,20 +66,32 @@ reads its configuration from the objdb. The following keys are read when it star
* quorum.quorumdev_poll
.br
* quorum.two_node
+.br
+* quorum.wait_for_all
+.br
+* quorum.last_man_standing
+.br
+* quorum.last_man_standing_window
+.br
+* quorum.auto_tie_breaker
.PP
-Most of those values can be changed while corosync is running with the following exception:
-.B two_node
-cannot be set on-the-fly, though it can be cleared. ie you can start with two nodes in the cluster
-and add a third without rebooting all the nodes.
+Values that can be changed at runtime are expected_votes, votes, quorumdev_poll and two_nodes
.PP
.SH BUGS
-This software is not yet production, so there may still be some bugs.
+No known bugs at the time of writing. The authors are from outerspace. Deal with it.
.SH "SEE ALSO"
.BR corosync-quorumtool (8),
-.BR votequorum_initialize (3),
-.BR votequorum_finalize (3),
-.BR votequorum_fd_get (3),
-.BR votequorum_dispatch (3),
.BR votequorum_context_get (3),
.BR votequorum_context_set (3),
+.BR votequorum_dispatch (3),
+.BR votequorum_fd_get (3),
+.BR votequorum_finalize (3),
+.BR votequorum_getinfo (3),
+.BR votequorum_initialize (3),
+.BR votequorum_qdisk_getinfo (3),
+.BR votequorum_qdisk_poll (3),
+.BR votequorum_qdisk_register (3),
+.BR votequorum_qdisk_unregister (3),
+.BR votequorum_setexpected (3),
+.BR votequorum_setvotes (3)
.PP
--
1.7.7.5
_______________________________________________
discuss mailing list
discuss@xxxxxxxxxxxx
http://lists.corosync.org/mailman/listinfo/discuss
