FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > Redhat > Cluster Development

 
 
LinkBack Thread Tools
 
Old 01-06-2011, 09:05 AM
"Fabio M. Di Nitto"
 
Default ccs_tool: completely remove references to update/upgrades

Drop parsing of CF options and update man page to better reflect
what ccs_tool is and does.

Resolves: rhbz#577874

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
config/tools/ccs_tool/editconf.c | 10 +++++-----
config/tools/man/ccs_tool.8 | 37 ++++++++-----------------------------
2 files changed, 13 insertions(+), 34 deletions(-)

diff --git a/config/tools/ccs_tool/editconf.c b/config/tools/ccs_tool/editconf.c
index 9477d4e..fe52665 100644
--- a/config/tools/ccs_tool/editconf.c
+++ b/config/tools/ccs_tool/editconf.c
@@ -1170,7 +1170,7 @@ static int parse_commonw_options(int argc, char **argv,

memset(ninfo, 0, sizeof(*ninfo));

- while ( (opt = getopt_long(argc, argv, "o:c:CFh?", commonw_options, NULL)) != EOF)
+ while ( (opt = getopt_long(argc, argv, "o:c:h?", commonw_options, NULL)) != EOF)
{
switch(opt)
{
@@ -1359,7 +1359,7 @@ void add_node(int argc, char **argv)
memset(&ninfo, 0, sizeof(ninfo));
ninfo.votes = "1";

- while ( (opt = getopt_long(argc, argv, "v:n:a:f:c:CFh?", addnode_options, NULL)) != EOF)
+ while ( (opt = getopt_long(argc, argv, "v:n:a:f:c:h?", addnode_options, NULL)) != EOF)
{
switch(opt)
{
@@ -1546,7 +1546,7 @@ void add_service(int argc, char **argv)
ninfo.autostart = "1";
ninfo.recovery = "relocate";

- while ( (opt = getopt_long(argc, argv, "a:d:x:r:f:c:s:i:CFh?", addservice_options, NULL)) != EOF)
+ while ( (opt = getopt_long(argc, argv, "a:d:x:r:f:c:s:i:h?", addservice_options, NULL)) != EOF)
{
switch(opt)
{
@@ -1787,7 +1787,7 @@ void add_fs(int argc, char **argv)

memset(&ninfo, 0, sizeof(ninfo));

- while ( (opt = getopt_long(argc, argv, "t:c:CFh?kus", addfs_options, NULL)) != EOF)
+ while ( (opt = getopt_long(argc, argv, "t:c:h?kus", addfs_options, NULL)) != EOF)
{
switch(opt)
{
@@ -1858,7 +1858,7 @@ void add_fdomain(int argc, char **argv)

memset(&ninfo, 0, sizeof(ninfo));

- while ( (opt = getopt_long(argc, argv, "pro:c:CFh?", addfdomain_options, NULL)) != EOF)
+ while ( (opt = getopt_long(argc, argv, "pro:c:h?", addfdomain_options, NULL)) != EOF)
{
switch(opt)
{
diff --git a/config/tools/man/ccs_tool.8 b/config/tools/man/ccs_tool.8
index dd409e4..0f52f18 100644
--- a/config/tools/man/ccs_tool.8
+++ b/config/tools/man/ccs_tool.8
@@ -1,6 +1,6 @@
.TH "ccs_tool" "8" "" "" ""
.SH "NAME"
-ccs_tool - The tool used to make online updates of CCS config files.
+ccs_tool - The tool used to make online queries to the cluster configuration.

.SH "SYNOPSIS"
.B ccs_tool
@@ -8,10 +8,9 @@ ccs_tool - The tool used to make online updates of CCS config files.

.SH "DESCRIPTION"

-fBccs_toolfP is part of the Cluster Configuration System (CCS). It is
-used to make online updates to cluster.conf. It can also be used to
-upgrade old style (GFS <= 6.0) CCS archives to the new xml cluster.conf
-format.
+fBccs_toolfP is part of the Cluster Configuration System (CCS). It used
+to peform different kind of queries to the cluster configuration and has support
+for some cluster.conf editing functions.

.SH "OPTIONS"
.TP
@@ -24,6 +23,10 @@ Print the version information.
sub-commands have their own options, see below for more detail
.SH "COMMANDS"

+.TP
+fBqueryfP fI<xpath query>fP
+Perform an xpath query on running cluster configuration.
+
.TP
fBaddnodefP [options] fI<node> [<fenceoption=value>]...fP
Adds a new node to the cluster configuration file. Fencing device options
@@ -51,12 +54,6 @@ section must already have been added to the file, probably using the addfence co
-c <file> Config file to use. Defaults to /etc/cluster/cluster.conf
.br
-o <file> Output file. Defaults to the same as -c
-.br
--C Don't run "ccs_tool update" after changing file. This will
-happen by default if the input file is the same as the output file.
-.br
--F Force a "ccs_tool update" even if the input and output files
-are different.



@@ -71,12 +68,6 @@ and add it back in with the new properties.
-c <file> Config file to use. Defaults to /etc/cluster/cluster.conf
.br
-o <file> Output file. Defaults to the same as -c
-.br
--C Don't run "ccs_tool update" after changing file. This will
-happen by default if the input file is the same as the output file.
-.br
--F Force a "ccs_tool update" even if the input and output files
-are different.



@@ -93,12 +84,6 @@ device.
-c <file> Config file to use. Defaults to /etc/cluster/cluster.conf
.br
-o <file> Output file. Defaults to the same as -c
-.br
--C Don't run "ccs_tool update" after changing file. This will
-happen by default if the input file is the same as the output file.
-.br
--F Force a "ccs_tool update" even if the input and output files
-are different.

.TP
fBdelfencefP [options] fI<node>fP
@@ -112,12 +97,6 @@ invalid configuration file if you don't add it back in again.
-c <file> Config file to use. Defaults to /etc/cluster/cluster.conf
.br
-o <file> Output file. Defaults to the same as -c
-.br
--C Don't run "ccs_tool update" after changing file. This will
-happen by default if the input file is the same as the output file.
-.br
--F Force a "ccs_tool update" even if the input and output files
-are different.


.TP
--
1.7.2.3
 

Thread Tools




All times are GMT. The time now is 04:06 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org