Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:sschapiro:openstack:upstream
cluster
cman_config_reload_fix_part1.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File cman_config_reload_fix_part1.patch of Package cluster
commit 2f5475b2be1e7ead3501400aea9887b181246e20 Author: Lon Hohberger <lhh@redhat.com> Date: Thu Jul 22 14:44:17 2010 -0400 cman: Deprecate specifying config version to cman_tool Historically, updating the configuration file required two discrete steps: 1) send configuration to all nodes, and 2) tell CMAN about the new configuration version There has always been a possibility that an incorrect version number could be sent to CMAN, causing it to have a different version than the one in cluster.conf. In the STABLE3 and later branches as of commit 75fb0324, the necessity for specifying the version # has been removed; users could instead just use '-r 0' to use the configuration version in the current cluster.conf. This patch deprecates specification of the configuration version number from the cman_tool command line while attempting to retain command-line tool compatibility. That is, you may specify '-r123', but it will be ignored and a warning will be printed. Resolves: rhbz#617161, rhbz#617163 Signed-off-by: Lon Hohberger <lhh@redhat.com> diff --git a/cman/cman_tool/main.c b/cman/cman_tool/main.c index d8b08dd..a731323 100644 --- a/cman/cman_tool/main.c +++ b/cman/cman_tool/main.c @@ -10,7 +10,7 @@ #define DEFAULT_CONFIG_MODULE "xmlconfig" -#define OPTION_STRING ("m:n:v:e:2p:c:r:i:N:t:o:k:F:C:VAPwfqah?XD::Sd::") +#define OPTION_STRING ("m:n:v:e:2p:c:i:N:t:o:k:F:C:VAPwfqah?XD::Sd::r::") #define OP_JOIN 1 #define OP_LEAVE 2 #define OP_EXPECTED 3 @@ -118,7 +118,7 @@ static void print_usage(int subcmd) if (!subcmd || subcmd == OP_VERSION) { printf("version\n"); - printf(" -r <config> A new config version to set on all members\n"); + printf(" -r Reload cluster.conf and update config version.\n"); printf(" -D <fail,warn,none> What to do about the config. Default (without -D) is to\n"); printf(" validate the config. with -D no validation will be done. -Dwarn will print errors\n"); printf(" but allow the operation to continue\n"); @@ -876,6 +876,7 @@ static void decode_arguments(int argc, char *argv[], commandline_t *comline) int optchar, i; int suboptchar; int show_help = 0; + char buf[16]; while (cont) { optchar = getopt(argc, argv, OPTION_STRING); @@ -943,8 +944,13 @@ static void decode_arguments(int argc, char *argv[], commandline_t *comline) break; case 'r': - comline->config_version = get_int_arg(optchar, optarg); + comline->config_version = 0; comline->config_version_opt = TRUE; + if (optarg) { + fprintf(stderr, "Warning: specifying a " + "version for the -r flag is " + "deprecated and no longer used\n"); + } break; case 'v': @@ -1092,8 +1098,19 @@ static void decode_arguments(int argc, char *argv[], commandline_t *comline) comline->remove = TRUE; } else if (strcmp(argv[optind], "force") == 0) { comline->force = TRUE; - } else - die("unknown option %s", argv[optind]); + } else { + snprintf(buf, sizeof(buf), + "%d", atoi(argv[optind])); + if (!strcmp(buf, argv[optind]) && + (comline->config_version_opt == TRUE) && + comline->operation == OP_VERSION) { + fprintf(stderr, "Warning: specifying a " + "version for the -r flag is " + "deprecated and no longer used\n"); + } else { + die("unknown option %s", argv[optind]); + } + } optind++; }
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor