Page MenuHomeClusterLabs Projects
Files F7609187

No OneTemporary
Actions

View Options

diff --git a/cts/cli/regression.crm_verify.exp b/cts/cli/regression.crm_verify.exp
index dba7c42d82..9b8b45efa4 100644
--- a/cts/cli/regression.crm_verify.exp
+++ b/cts/cli/regression.crm_verify.exp
@@ -1,104 +1,104 @@
=#=#=#= Begin test: Verify a file-specified invalid configuration =#=#=#=
-Configuration invalid (with errors) (-V may provide more detail)
+Configuration invalid (-V may provide more detail)
=#=#=#= End test: Verify a file-specified invalid configuration - Invalid configuration (78) =#=#=#=
* Passed: crm_verify - Verify a file-specified invalid configuration
=#=#=#= Begin test: Verify a file-specified invalid configuration (XML) =#=#=#=
<pacemaker-result api-version="X" request="crm_verify --output-as=xml --xml-file CTS_CLI_DATA/crm_verify_invalid_bz.xml">
<status code="78" message="Invalid configuration">
<errors>
<error>error: Resource test2:0 is of type systemd and therefore cannot be used as a promotable clone resource</error>
<error>error: Ignoring &lt;clone&gt; resource 'test2-clone' because configuration is invalid</error>
<error>error: CIB did not pass schema validation</error>
- <error>Configuration invalid (with errors)</error>
+ <error>Configuration invalid</error>
</errors>
</status>
</pacemaker-result>
=#=#=#= End test: Verify a file-specified invalid configuration (XML) - Invalid configuration (78) =#=#=#=
* Passed: crm_verify - Verify a file-specified invalid configuration (XML)
=#=#=#= Begin test: Verify a file-specified invalid configuration (verbose) =#=#=#=
unpack_config warning: Blind faith: not fencing unseen nodes
error: Resource test2:0 is of type systemd and therefore cannot be used as a promotable clone resource
error: Ignoring <clone> resource 'test2-clone' because configuration is invalid
error: CIB did not pass schema validation
-Configuration invalid (with errors)
+Configuration invalid
=#=#=#= End test: Verify a file-specified invalid configuration (verbose) - Invalid configuration (78) =#=#=#=
* Passed: crm_verify - Verify a file-specified invalid configuration (verbose)
=#=#=#= Begin test: Verify a file-specified invalid configuration (verbose) (XML) =#=#=#=
unpack_config warning: Blind faith: not fencing unseen nodes
<pacemaker-result api-version="X" request="crm_verify --output-as=xml --xml-file CTS_CLI_DATA/crm_verify_invalid_bz.xml --verbose">
<status code="78" message="Invalid configuration">
<errors>
<error>error: Resource test2:0 is of type systemd and therefore cannot be used as a promotable clone resource</error>
<error>error: Ignoring &lt;clone&gt; resource 'test2-clone' because configuration is invalid</error>
<error>error: CIB did not pass schema validation</error>
- <error>Configuration invalid (with errors)</error>
+ <error>Configuration invalid</error>
</errors>
</status>
</pacemaker-result>
=#=#=#= End test: Verify a file-specified invalid configuration (verbose) (XML) - Invalid configuration (78) =#=#=#=
* Passed: crm_verify - Verify a file-specified invalid configuration (verbose) (XML)
=#=#=#= Begin test: Verify a file-specified invalid configuration (quiet) =#=#=#=
=#=#=#= End test: Verify a file-specified invalid configuration (quiet) - Invalid configuration (78) =#=#=#=
* Passed: crm_verify - Verify a file-specified invalid configuration (quiet)
=#=#=#= Begin test: Verify a file-specified invalid configuration (quiet) (XML) =#=#=#=
<pacemaker-result api-version="X" request="crm_verify --output-as=xml --xml-file CTS_CLI_DATA/crm_verify_invalid_bz.xml --quiet">
<status code="78" message="Invalid configuration">
<errors>
<error>error: Resource test2:0 is of type systemd and therefore cannot be used as a promotable clone resource</error>
<error>error: Ignoring &lt;clone&gt; resource 'test2-clone' because configuration is invalid</error>
<error>error: CIB did not pass schema validation</error>
</errors>
</status>
</pacemaker-result>
=#=#=#= End test: Verify a file-specified invalid configuration (quiet) (XML) - Invalid configuration (78) =#=#=#=
* Passed: crm_verify - Verify a file-specified invalid configuration (quiet) (XML)
=#=#=#= Begin test: Verify another file-specified invalid configuration (XML) =#=#=#=
<pacemaker-result api-version="X" request="crm_verify --xml-file CTS_CLI_DATA/crm_verify_invalid_no_stonith.xml --output-as=xml">
<status code="78" message="Invalid configuration">
<errors>
<error>error: Resource start-up disabled since no fencing resources have been defined. Either configure some or disable fencing with the fencing-enabled option. NOTE: Clusters with shared data need fencing to ensure data integrity.</error>
<error>warning: Node pcmk-1 is unclean but cannot be fenced</error>
<error>warning: Node pcmk-2 is unclean but cannot be fenced</error>
<error>error: CIB did not pass schema validation</error>
- <error>Configuration invalid (with errors)</error>
+ <error>Configuration invalid</error>
</errors>
</status>
</pacemaker-result>
=#=#=#= End test: Verify another file-specified invalid configuration (XML) - Invalid configuration (78) =#=#=#=
* Passed: crm_verify - Verify another file-specified invalid configuration (XML)
=#=#=#= Begin test: Verify a file-specified valid configuration (XML) =#=#=#=
<pacemaker-result api-version="X" request="crm_verify --xml-file CTS_CLI_DATA/crm_mon.xml --output-as=xml">
<status code="0" message="OK"/>
</pacemaker-result>
=#=#=#= End test: Verify a file-specified valid configuration (XML) - OK (0) =#=#=#=
* Passed: crm_verify - Verify a file-specified valid configuration (XML)
=#=#=#= Begin test: Verify a piped-in valid configuration (XML) =#=#=#=
<pacemaker-result api-version="X" request="crm_verify -p --output-as=xml">
<status code="0" message="OK"/>
</pacemaker-result>
=#=#=#= End test: Verify a piped-in valid configuration (XML) - OK (0) =#=#=#=
* Passed: crm_verify - Verify a piped-in valid configuration (XML)
=#=#=#= Begin test: Verbosely verify a file-specified valid configuration (XML) =#=#=#=
<pacemaker-result api-version="X" request="crm_verify --xml-file CTS_CLI_DATA/crm_mon.xml --output-as=xml --verbose">
<status code="0" message="OK"/>
</pacemaker-result>
=#=#=#= End test: Verbosely verify a file-specified valid configuration (XML) - OK (0) =#=#=#=
* Passed: crm_verify - Verbosely verify a file-specified valid configuration (XML)
=#=#=#= Begin test: Verbosely verify a piped-in valid configuration (XML) =#=#=#=
<pacemaker-result api-version="X" request="crm_verify -p --output-as=xml --verbose">
<status code="0" message="OK"/>
</pacemaker-result>
=#=#=#= End test: Verbosely verify a piped-in valid configuration (XML) - OK (0) =#=#=#=
* Passed: crm_verify - Verbosely verify a piped-in valid configuration (XML)
=#=#=#= Begin test: Verify a string-supplied valid configuration (XML) =#=#=#=
<pacemaker-result api-version="X" request="crm_verify -X '...' --output-as=xml">
<status code="0" message="OK"/>
</pacemaker-result>
=#=#=#= End test: Verify a string-supplied valid configuration (XML) - OK (0) =#=#=#=
* Passed: crm_verify - Verify a string-supplied valid configuration (XML)
=#=#=#= Begin test: Verbosely verify a string-supplied valid configuration (XML) =#=#=#=
<pacemaker-result api-version="X" request="crm_verify -X '...' --output-as=xml --verbose">
<status code="0" message="OK"/>
</pacemaker-result>
=#=#=#= End test: Verbosely verify a string-supplied valid configuration (XML) - OK (0) =#=#=#=
* Passed: crm_verify - Verbosely verify a string-supplied valid configuration (XML)
diff --git a/tools/crm_verify.c b/tools/crm_verify.c
index 9266238b98..269959635a 100644
--- a/tools/crm_verify.c
+++ b/tools/crm_verify.c
@@ -1,299 +1,299 @@
/*
* Copyright 2004-2024 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 <crm/common/cmdline_internal.h>
#include <crm/common/output_internal.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/cib.h>
#include <crm/cib/internal.h>
#include <crm/pengine/status.h>
#include <pacemaker-internal.h>
const char *SUMMARY = "Check a Pacemaker configuration for errors\n\n"
"Check the well-formedness of a complete Pacemaker XML configuration,\n"
"its conformance to the configured schema, and the presence of common\n"
"misconfigurations. Problems reported as errors must be fixed before the\n"
"cluster will work properly. It is left to the administrator to decide\n"
"whether to fix problems reported as warnings.";
struct {
char *cib_save;
gboolean use_live_cib;
char *xml_file;
gboolean xml_stdin;
char *xml_string;
unsigned int verbosity;
} options;
static GOptionEntry data_entries[] = {
{ "live-check", 'L', 0, G_OPTION_ARG_NONE,
&options.use_live_cib, "Check the configuration used by the running cluster",
NULL },
{ "xml-file", 'x', 0, G_OPTION_ARG_FILENAME,
&options.xml_file, "Check the configuration in the named file",
"FILE" },
{ "xml-pipe", 'p', 0, G_OPTION_ARG_NONE,
&options.xml_stdin, "Check the configuration piped in via stdin",
NULL },
{ "xml-text", 'X', 0, G_OPTION_ARG_STRING,
&options.xml_string, "Check the configuration in the supplied string",
"XML" },
{ NULL }
};
static GOptionEntry addl_entries[] = {
{ "save-xml", 'S', G_OPTION_FLAG_NONE, G_OPTION_ARG_FILENAME,
&options.cib_save, "Save verified XML to named file (most useful with -L)",
"FILE" },
{ NULL }
};
static pcmk__supported_format_t formats[] = {
PCMK__SUPPORTED_FORMAT_NONE,
PCMK__SUPPORTED_FORMAT_TEXT,
PCMK__SUPPORTED_FORMAT_XML,
{ NULL, NULL, NULL }
};
static GOptionContext *
build_arg_context(pcmk__common_args_t *args, GOptionGroup **group) {
GOptionContext *context = NULL;
const char *description = "Examples:\n\n"
"Check the consistency of the configuration in the running cluster:\n\n"
"\tcrm_verify --live-check\n\n"
"Check the consistency of the configuration in a given file and "
"produce quiet output:\n\n"
"\tcrm_verify --xml-file file.xml --quiet\n\n"
"Check the consistency of the configuration in a given file and "
"produce verbose output:\n\n"
"\tcrm_verify --xml-file file.xml --verbose\n\n";
GOptionEntry extra_prog_entries[] = {
{ "quiet", 'q', 0, G_OPTION_ARG_NONE, &(args->quiet),
"Don't print verify information",
NULL },
{ NULL }
};
context = pcmk__build_arg_context(args, "text (default), xml", group, NULL);
pcmk__add_main_args(context, extra_prog_entries);
g_option_context_set_description(context, description);
pcmk__add_arg_group(context, "data", "Data sources:",
"Show data options", data_entries);
pcmk__add_arg_group(context, "additional", "Additional options:",
"Show additional options", addl_entries);
return context;
}
/*!
* \internal
* \brief Output a configuration error
*
* \param[in] ctx Output object
* \param[in] msg printf(3)-style format string
* \param[in] ... Format string arguments
*/
G_GNUC_PRINTF(2, 3)
static void
output_config_error(void *ctx, const char *msg, ...)
{
va_list ap;
char *buf = NULL;
pcmk__output_t *out = ctx;
va_start(ap, msg);
pcmk__assert(vasprintf(&buf, msg, ap) > 0);
if (options.verbosity > 0) {
out->err(out, "error: %s", buf);
}
va_end(ap);
}
/*!
* \internal
* \brief Output a configuration warning
*
* \param[in] ctx Output object
* \param[in] msg printf(3)-style format string
* \param[in] ... Format string arguments
*/
G_GNUC_PRINTF(2, 3)
static void
output_config_warning(void *ctx, const char *msg, ...)
{
va_list ap;
char *buf = NULL;
pcmk__output_t *out = ctx;
va_start(ap, msg);
pcmk__assert(vasprintf(&buf, msg, ap) > 0);
if (options.verbosity > 0) {
out->err(out, "warning: %s", buf);
}
va_end(ap);
}
int
main(int argc, char **argv)
{
pcmk_scheduler_t *scheduler = NULL;
int rc = pcmk_rc_ok;
crm_exit_t exit_code = CRM_EX_OK;
GError *error = NULL;
pcmk__output_t *out = NULL;
const char *cib_source = NULL;
xmlNode *cib_object = NULL;
GOptionGroup *output_group = NULL;
pcmk__common_args_t *args = pcmk__new_common_args(SUMMARY);
gchar **processed_args = pcmk__cmdline_preproc(argv, "xSX");
GOptionContext *context = build_arg_context(args, &output_group);
pcmk__register_formats(output_group, formats);
if (!g_option_context_parse_strv(context, &processed_args, &error)) {
exit_code = CRM_EX_USAGE;
goto done;
}
if (args->verbosity > 0) {
args->verbosity -= args->quiet;
}
pcmk__cli_init_logging("crm_verify", args->verbosity);
rc = pcmk__output_new(&out, args->output_ty, args->output_dest, argv);
if (rc != pcmk_rc_ok) {
exit_code = CRM_EX_ERROR;
g_set_error(&error, PCMK__EXITC_ERROR, exit_code,
"Error creating output format %s: %s",
args->output_ty, pcmk_rc_str(rc));
goto done;
}
if (args->version) {
out->version(out);
goto done;
}
pcmk__register_lib_messages(out);
pcmk__set_config_error_handler(output_config_error, out);
pcmk__set_config_warning_handler(output_config_warning, out);
if (pcmk__str_eq(args->output_ty, "xml", pcmk__str_none)) {
args->verbosity = 1;
}
options.verbosity = args->verbosity;
if (options.xml_file != NULL) {
cib_source = options.xml_file;
} else if (options.xml_string != NULL) {
cib_source = options.xml_string;
} else if (options.xml_stdin) {
cib_source = "-";
} else if (options.use_live_cib) {
cib_source = NULL;
} else {
rc = ENODATA;
g_set_error(&error, PCMK__RC_ERROR, rc, "No input specified");
goto done;
}
rc = pcmk__parse_cib(out, cib_source, &cib_object);
if (rc != pcmk_rc_ok) {
g_set_error(&error, PCMK__RC_ERROR, rc, "Verification failed: %s",
pcmk_rc_str(rc));
goto done;
}
if (options.cib_save != NULL) {
pcmk__xml_write_file(cib_object, options.cib_save, false);
}
scheduler = pcmk_new_scheduler();
if (scheduler == NULL) {
rc = errno;
g_set_error(&error, PCMK__RC_ERROR, rc,
"Could not allocate scheduler data: %s", pcmk_rc_str(rc));
goto done;
}
scheduler->priv->out = out;
rc = pcmk__verify(scheduler, out, &cib_object);
if ((rc == pcmk_rc_schema_validation) && !args->quiet) {
const char *failure_type = "";
const char *verbose_hint = "";
if (pcmk__config_has_error) {
- failure_type = " (with errors)";
+ failure_type = "invalid";
} else if (pcmk__config_has_warning) {
- failure_type = " (with warnings)";
+ failure_type = "may need attention";
}
if (options.verbosity == 0) {
verbose_hint = " (-V may provide more detail)";
}
- out->err(out, "Configuration invalid%s%s", failure_type, verbose_hint);
+ out->err(out, "Configuration %s%s", failure_type, verbose_hint);
}
pcmk_free_scheduler(scheduler);
done:
g_strfreev(processed_args);
pcmk__free_arg_context(context);
free(options.cib_save);
free(options.xml_file);
free(options.xml_string);
if (cib_object != NULL) {
pcmk__xml_free(cib_object);
}
if (exit_code == CRM_EX_OK) {
exit_code = pcmk_rc2exitc(rc);
}
pcmk__output_and_clear_error(&error, out);
if (out != NULL) {
out->finish(out, exit_code, true, NULL);
pcmk__output_free(out);
}
pcmk__unregister_formats();
crm_exit(exit_code);
}

File Metadata

Mime Type
text/x-diff
Expires
Wed, Oct 15, 11:47 PM (2 h, 46 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2461694
Default Alt Text
(16 KB)

Event Timeline