Page MenuHomeClusterLabs Projects
Files F2824969

No OneTemporary
Actions

View Options

diff --git a/tools/crm_verify.c b/tools/crm_verify.c
index 1bc890fd77..507683cfeb 100644
--- a/tools/crm_verify.c
+++ b/tools/crm_verify.c
@@ -1,320 +1,326 @@
/*
* Copyright 2004-2021 the Pacemaker project contributors
*
* The version control history for this file may have further details.
*
* This source code is licensed under the GNU General Public License version 2
* or later (GPLv2+) WITHOUT ANY WARRANTY.
*/
#include <crm_internal.h>
#include <crm/crm.h>
#include <stdio.h>
#include <sys/types.h>
#include <unistd.h>
#include <stdlib.h>
#include <errno.h>
#include <fcntl.h>
#include <libgen.h>
#include <glib.h>
#include <crm/common/xml.h>
#include <crm/common/util.h>
#include <crm/msg_xml.h>
#include <crm/cib.h>
#include <crm/pengine/status.h>
#include <pacemaker-internal.h>
-gboolean USE_LIVE_CIB = FALSE;
-char *cib_save = NULL;
+struct {
+ char *cib_save;
+ gboolean use_live_cib;
+ char *xml_file;
+ gboolean xml_stdin;
+ char *xml_string;
+} options;
+
extern gboolean stage0(pe_working_set_t * data_set);
static pcmk__cli_option_t long_options[] = {
// long option, argument type, storage, short option, description, flags
{
"help", no_argument, NULL, '?',
"\tThis text", pcmk__option_default
},
{
"version", no_argument, NULL, '$',
"\tVersion information", pcmk__option_default
},
{
"verbose", no_argument, NULL, 'V',
"\tSpecify multiple times to increase debug output\n",
pcmk__option_default
},
{
"-spacer-", no_argument, NULL, '-',
"\nData sources:", pcmk__option_default
},
{
"live-check", no_argument, NULL, 'L',
"Check the configuration used by the running cluster\n",
pcmk__option_default
},
{
"xml-file", required_argument, NULL, 'x',
"Check the configuration in the named file", pcmk__option_default
},
{
"xml-text", required_argument, NULL, 'X',
"Check the configuration in the supplied string", pcmk__option_default
},
{
"xml-pipe", no_argument, NULL, 'p',
"Check the configuration piped in via stdin", pcmk__option_default
},
{
"-spacer-", no_argument, NULL, '-',
"\nAdditional Options:", pcmk__option_default
},
{
"save-xml", required_argument, 0, 'S',
"Save verified XML to named file (most useful with -L)",
pcmk__option_default
},
{
"-spacer-", no_argument, NULL, '-',
"\nExamples:", pcmk__option_paragraph
},
{
"-spacer-", no_argument, NULL, '-',
"Check the consistency of the configuration in the running cluster:",
pcmk__option_paragraph
},
{
"-spacer-", no_argument, NULL, '-',
" crm_verify --live-check", pcmk__option_example
},
{
"-spacer-", no_argument, NULL, '-',
"Check the consistency of the configuration in a given file and "
"produce verbose output:",
pcmk__option_paragraph
},
{
"-spacer-", no_argument, NULL, '-',
" crm_verify --xml-file file.xml --verbose", pcmk__option_example
},
{0, 0, 0, 0}
};
int
main(int argc, char **argv)
{
xmlNode *cib_object = NULL;
xmlNode *status = NULL;
int argerr = 0;
int flag;
int option_index = 0;
pe_working_set_t *data_set = NULL;
cib_t *cib_conn = NULL;
int rc = pcmk_rc_ok;
bool verbose = FALSE;
- gboolean xml_stdin = FALSE;
const char *xml_tag = NULL;
- const char *xml_file = NULL;
- const char *xml_string = NULL;
pcmk__cli_init_logging("crm_verify", 0);
pcmk__set_cli_options(NULL, "[options]", long_options,
"check a Pacemaker configuration for errors\n\n"
"Check the well-formedness of a complete Pacemaker "
"XML configuration,\nits conformance to the "
"configured schema, and the presence of common\n"
"misconfigurations. Problems reported as errors "
"must be fixed before the\ncluster will work "
"properly. It is left to the administrator to decide"
"\nwhether to fix problems reported as warnings.");
while (1) {
flag = pcmk__next_cli_option(argc, argv, &option_index, NULL);
if (flag == -1)
break;
switch (flag) {
case 'X':
crm_trace("Option %c => %s", flag, optarg);
- xml_string = optarg;
+ options.xml_string = optarg;
break;
case 'x':
crm_trace("Option %c => %s", flag, optarg);
- xml_file = optarg;
+ options.xml_file = optarg;
break;
case 'p':
- xml_stdin = TRUE;
+ options.xml_stdin = TRUE;
break;
case 'S':
- cib_save = optarg;
+ options.cib_save = optarg;
break;
case 'V':
verbose = TRUE;
crm_bump_log_level(argc, argv);
break;
case 'L':
- USE_LIVE_CIB = TRUE;
+ options.use_live_cib = TRUE;
break;
case '$':
case '?':
pcmk__cli_help(flag, CRM_EX_OK);
break;
default:
fprintf(stderr, "Option -%c is not yet supported\n", flag);
++argerr;
break;
}
}
if (optind < argc) {
printf("non-option ARGV-elements: ");
while (optind < argc) {
printf("%s ", argv[optind++]);
}
printf("\n");
}
if (optind > argc) {
++argerr;
}
if (argerr) {
crm_err("%d errors in option parsing", argerr);
pcmk__cli_help(flag, CRM_EX_USAGE);
}
crm_info("=#=#=#=#= Getting XML =#=#=#=#=");
- if (USE_LIVE_CIB) {
+ if (options.use_live_cib) {
cib_conn = cib_new();
rc = cib_conn->cmds->signon(cib_conn, crm_system_name, cib_command);
rc = pcmk_legacy2rc(rc);
}
- if (USE_LIVE_CIB) {
+ if (options.use_live_cib) {
if (rc == pcmk_rc_ok) {
int options = cib_scope_local | cib_sync_call;
crm_info("Reading XML from: live cluster");
rc = cib_conn->cmds->query(cib_conn, NULL, &cib_object, options);
rc = pcmk_legacy2rc(rc);
}
if (rc != pcmk_rc_ok) {
fprintf(stderr, "Live CIB query failed: %s\n", pcmk_rc_str(rc));
goto done;
}
if (cib_object == NULL) {
fprintf(stderr, "Live CIB query failed: empty result\n");
rc = ENOMSG;
goto done;
}
- } else if (xml_file != NULL) {
- cib_object = filename2xml(xml_file);
+ } else if (options.xml_file != NULL) {
+ cib_object = filename2xml(options.xml_file);
if (cib_object == NULL) {
- fprintf(stderr, "Couldn't parse input file: %s\n", xml_file);
+ fprintf(stderr, "Couldn't parse input file: %s\n", options.xml_file);
rc = ENODATA;
goto done;
}
- } else if (xml_string != NULL) {
- cib_object = string2xml(xml_string);
+ } else if (options.xml_string != NULL) {
+ cib_object = string2xml(options.xml_string);
if (cib_object == NULL) {
- fprintf(stderr, "Couldn't parse input string: %s\n", xml_string);
+ fprintf(stderr, "Couldn't parse input string: %s\n", options.xml_string);
rc = ENODATA;
goto done;
}
- } else if (xml_stdin) {
+ } else if (options.xml_stdin) {
cib_object = stdin2xml();
if (cib_object == NULL) {
fprintf(stderr, "Couldn't parse input from STDIN.\n");
rc = ENODATA;
goto done;
}
} else {
fprintf(stderr, "No configuration source specified."
" Use --help for usage information.\n");
rc = ENODATA;
goto done;
}
xml_tag = crm_element_name(cib_object);
if (!pcmk__str_eq(xml_tag, XML_TAG_CIB, pcmk__str_casei)) {
fprintf(stderr,
"This tool can only check complete configurations (i.e. those starting with <cib>).\n");
rc = EBADMSG;
goto done;
}
- if (cib_save != NULL) {
- write_xml_file(cib_object, cib_save, FALSE);
+ if (options.cib_save != NULL) {
+ write_xml_file(cib_object, options.cib_save, FALSE);
}
status = get_object_root(XML_CIB_TAG_STATUS, cib_object);
if (status == NULL) {
create_xml_node(cib_object, XML_CIB_TAG_STATUS);
}
if (validate_xml(cib_object, NULL, FALSE) == FALSE) {
pcmk__config_err("CIB did not pass schema validation");
free_xml(cib_object);
cib_object = NULL;
} else if (cli_config_update(&cib_object, NULL, FALSE) == FALSE) {
pcmk__config_error = true;
free_xml(cib_object);
cib_object = NULL;
fprintf(stderr, "The cluster will NOT be able to use this configuration.\n");
fprintf(stderr, "Please manually update the configuration to conform to the %s syntax.\n",
xml_latest_schema());
}
data_set = pe_new_working_set();
if (data_set == NULL) {
rc = errno;
crm_perror(LOG_CRIT, "Unable to allocate working set");
goto done;
}
pe__set_working_set_flags(data_set, pe_flag_no_counts|pe_flag_no_compat);
if (cib_object == NULL) {
- } else if (status != NULL || USE_LIVE_CIB) {
+ } else if (status != NULL || options.use_live_cib) {
/* live queries will always have a status section and can do a full simulation */
pcmk__schedule_actions(data_set, cib_object, NULL);
} else {
data_set->now = crm_time_new(NULL);
data_set->input = cib_object;
stage0(data_set);
}
pe_free_working_set(data_set);
if (pcmk__config_error) {
fprintf(stderr, "Errors found during check: config not valid\n");
if (verbose == FALSE) {
fprintf(stderr, " -V may provide more details\n");
}
rc = pcmk_rc_schema_validation;
} else if (pcmk__config_warning) {
fprintf(stderr, "Warnings found during check: config may not be valid\n");
if (verbose == FALSE) {
fprintf(stderr, " Use -V -V for more details\n");
}
rc = pcmk_rc_schema_validation;
}
- if (USE_LIVE_CIB && cib_conn) {
+ if (options.use_live_cib && cib_conn) {
cib_conn->cmds->signoff(cib_conn);
cib_delete(cib_conn);
}
done:
+ free(options.cib_save);
+ free(options.xml_file);
+ free(options.xml_string);
crm_exit(pcmk_rc2exitc(rc));
}

File Metadata

Mime Type
text/x-diff
Expires
Sat, Jan 25, 11:07 AM (1 d, 1 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1319613
Default Alt Text
(10 KB)

Event Timeline