5d00ae06f7
- fencing: Return a provider for the internal fencing agent "#watchdog" instead of logging an error (bsc#949441) * bug-949441_pacemaker-fencing-provider-internal.patch - spec: Move the normal resource agents into pacemaker-cli package (bsc#947197) - spec: Move logrotate configuration file into pacemaker-cli package (bsc#947197) - spec: Move attrd_updater, crm_attribute and crm_master into pacemaker-cli package (bsc#947197) - spec: Move xml schema files and PCMK-MIB.txt into pacemaker-cli package (bsc#947197) - crm_resource: Correctly observe --force when deleting and updating attributes (bsc#948197) - crm_resource: Correctly delete existing meta attributes regardless of their position in the heirarchy (bsc#948197) - fencing,libfencing: use level tag consistently in internal XML - crm_resource: Correctly update existing meta attributes regardless of their position in the heirarchy (bsc#948197) - crmd: properly detect CIB update failures for remote nodes - cibadmin: Prevent potential use-of-NULL in print_xml_output() (bsc#947180) - Fencing: The device list is expected to be comma separated - Tools: Do not send command lines to syslog - Tools: Repair the logging of 'interesting' command-lines - PE: resolve memory leak - libfencing: make topology level removal compatible with latest stonithd API - fencing: parse from correct XML location when registering/unregistering topology - tools: improve error handling when modifying configuration - crmd,libcrmcommon,libservices,tools: potential memory leaks (bsc#948197) - crmd,fencing: avoid potential null dereference in string searches - typo: OPSTIONS -> OPTIONS in crm_mon.sysconfig - cib: Check if the configuration changes with cib_config_changed() only for v1 diffs (bsc#946224) - liblrmd: don't print error if remote key environment variable unset - libcib: properly handle temporary file - libcrmcommon: better validation of environment variable value - crmd: avoid potential null dereference - libcib: potential user input overflow - controld: replace bashism OBS-URL: https://build.opensuse.org/request/show/337268 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=220
27 lines
725 B
Diff
27 lines
725 B
Diff
commit 61835593b43a5e0d29287f24fa5500f950b2bf6b
|
|
Author: Gao,Yan <ygao@suse.com>
|
|
Date: Mon Oct 5 17:44:13 2015 +0200
|
|
|
|
Fix: fencing: Return a provider for the internal fencing agent "#watchdog" instead of logging an error
|
|
|
|
diff --git a/lib/fencing/st_client.c b/lib/fencing/st_client.c
|
|
index b8f3967..b9fef3e 100644
|
|
--- a/lib/fencing/st_client.c
|
|
+++ b/lib/fencing/st_client.c
|
|
@@ -1499,8 +1499,13 @@ get_stonith_provider(const char *agent, const char *provider)
|
|
#endif
|
|
}
|
|
|
|
- crm_err("No such device: %s", agent);
|
|
- return NULL;
|
|
+ if (safe_str_eq(provider, "internal")) {
|
|
+ return provider;
|
|
+
|
|
+ } else {
|
|
+ crm_err("No such device: %s", agent);
|
|
+ return NULL;
|
|
+ }
|
|
}
|
|
|
|
static gint
|