Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-12-SP4:GA
pacemaker.23975
pacemaker-crmd-return-rich-error-codes-from-get...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File pacemaker-crmd-return-rich-error-codes-from-get_lrm_resource.patch of Package pacemaker.23975
commit 5cd92cfd37e6bd6ac3ec04a8ad4c8a9222f0d116 Author: Ken Gaillot <kgaillot@redhat.com> Date: Wed Feb 28 14:58:04 2018 -0600 Refactor: crmd: return rich error codes from get_lrm_resource() will allow for improved error handling diff --git a/crmd/lrm.c b/crmd/lrm.c index 2c9e3cffc..e1c546d32 100644 --- a/crmd/lrm.c +++ b/crmd/lrm.c @@ -1234,49 +1234,77 @@ cancel_op_key(lrm_state_t * lrm_state, lrmd_rsc_info_t * rsc, const char *key, g return data.done; } -static lrmd_rsc_info_t * -get_lrm_resource(lrm_state_t * lrm_state, xmlNode * resource, xmlNode * op_msg, gboolean do_create) +/*! + * \internal + * \brief Retrieve resource information from LRM + * + * \param[in] lrm_state LRM connection to use + * \param[in] rsc_xml XML containing resource configuration + * \param[in] do_create If true, register resource with LRM if not already + * \param[out] rsc_info Where to store resource information obtained from LRM + * + * \retval pcmk_ok Success (and rsc_info holds newly allocated result) + * \retval -EINVAL Required information is missing from arguments + * \retval -ENOTCONN No active connection to LRM + * \retval -ENODEV Resource not found + * \retval -errno Error communicating with lrmd when registering resource + * + * \note Caller is responsible for freeing result on success. + */ +static int +get_lrm_resource(lrm_state_t *lrm_state, xmlNode *rsc_xml, gboolean do_create, + lrmd_rsc_info_t **rsc_info) { - lrmd_rsc_info_t *rsc = NULL; - const char *id = ID(resource); - const char *type = crm_element_value(resource, XML_ATTR_TYPE); - const char *class = crm_element_value(resource, XML_AGENT_ATTR_CLASS); - const char *provider = crm_element_value(resource, XML_AGENT_ATTR_PROVIDER); - const char *long_id = crm_element_value(resource, XML_ATTR_ID_LONG); - - crm_trace("Retrieving %s from the LRM.", id); - CRM_CHECK(id != NULL, return NULL); + const char *id = ID(rsc_xml); - rsc = lrm_state_get_rsc_info(lrm_state, id, 0); + CRM_CHECK(lrm_state && rsc_xml && rsc_info, return -EINVAL); + CRM_CHECK(id, return -EINVAL); - if (!rsc && long_id) { - rsc = lrm_state_get_rsc_info(lrm_state, long_id, 0); + if (lrm_state_is_connected(lrm_state) == FALSE) { + return -ENOTCONN; } - if (!rsc && do_create) { - CRM_CHECK(class != NULL, return NULL); - CRM_CHECK(type != NULL, return NULL); + crm_trace("Retrieving resource information for %s from the LRM", id); + *rsc_info = lrm_state_get_rsc_info(lrm_state, id, 0); - crm_trace("Adding rsc %s before operation", id); + // If resource isn't known by ID, try clone name, if provided + if (!*rsc_info) { + const char *long_id = crm_element_value(rsc_xml, XML_ATTR_ID_LONG); - lrm_state_register_rsc(lrm_state, id, class, provider, type, lrmd_opt_drop_recurring); + if (long_id) { + *rsc_info = lrm_state_get_rsc_info(lrm_state, long_id, 0); + } + } - rsc = lrm_state_get_rsc_info(lrm_state, id, 0); + if ((*rsc_info == NULL) && do_create) { + const char *class = crm_element_value(rsc_xml, XML_AGENT_ATTR_CLASS); + const char *provider = crm_element_value(rsc_xml, XML_AGENT_ATTR_PROVIDER); + const char *type = crm_element_value(rsc_xml, XML_ATTR_TYPE); + int rc; - if (!rsc) { + crm_trace("Registering resource %s with LRM", id); + rc = lrm_state_register_rsc(lrm_state, id, class, provider, type, + lrmd_opt_drop_recurring); + if (rc != pcmk_ok) { fsa_data_t *msg_data = NULL; - crm_err("Could not add resource %s to LRM %s", id, lrm_state->node_name); - /* only register this as a internal error if this involves the local - * lrmd. Otherwise we're likely dealing with an unresponsive remote-node - * which is not a FSA failure. */ + crm_err("Could not register resource %s with LRM on %s: %s " + CRM_XS " rc=%d", + id, lrm_state->node_name, pcmk_strerror(rc), rc); + + /* Register this as an internal error if this involves the local + * lrmd. Otherwise, we're likely dealing with an unresponsive remote + * node, which is not an FSA failure. + */ if (lrm_state_is_local(lrm_state) == TRUE) { register_fsa_error(C_FSA_INTERNAL, I_FAIL, NULL); } + return rc; } - } - return rsc; + *rsc_info = lrm_state_get_rsc_info(lrm_state, id, 0); + } + return *rsc_info? pcmk_ok : -ENODEV; } static void @@ -1503,13 +1531,13 @@ fail_lrm_resource(xmlNode *xml, lrm_state_t *lrm_state, const char *user_name, } #endif - rsc = get_lrm_resource(lrm_state, xml_rsc, xml, TRUE); - if (rsc) { + if (get_lrm_resource(lrm_state, xml_rsc, TRUE, &rsc) == pcmk_ok) { crm_info("Failing resource %s...", rsc->id); process_lrm_event(lrm_state, op, NULL); op->op_status = PCMK_LRM_OP_DONE; op->rc = PCMK_OCF_OK; lrmd_free_rsc_info(rsc); + } else { crm_info("Cannot find/create resource in order to fail it..."); crm_log_xml_warn(xml, "bad input"); @@ -1780,24 +1808,27 @@ do_lrm_invoke(long long action, lrmd_rsc_info_t *rsc = NULL; xmlNode *xml_rsc = find_xml_node(input->xml, XML_CIB_TAG_RESOURCE, TRUE); gboolean create_rsc = safe_str_neq(operation, CRMD_ACTION_DELETE); + int rc; - CRM_CHECK(xml_rsc != NULL, return); + // We can't return anything meaningful without a resource ID + CRM_CHECK(xml_rsc && ID(xml_rsc), return); - if (lrm_state_is_connected(lrm_state) == FALSE) { - synthesize_lrmd_failure(lrm_state, input->xml, PCMK_OCF_CONNECTION_DIED); + rc = get_lrm_resource(lrm_state, xml_rsc, create_rsc, &rsc); + if (rc == -ENOTCONN) { + synthesize_lrmd_failure(lrm_state, input->xml, + PCMK_OCF_CONNECTION_DIED); return; - } - rsc = get_lrm_resource(lrm_state, xml_rsc, input->xml, create_rsc); - if ((rsc == NULL) && create_rsc) { + } else if ((rc < 0) && create_rsc) { crm_err("Invalid resource definition for %s", ID(xml_rsc)); crm_log_xml_warn(input->msg, "bad input"); /* if the operation couldn't complete because we can't register * the resource, return a generic error */ synthesize_lrmd_failure(lrm_state, input->xml, PCMK_OCF_NOT_CONFIGURED); + return; - } else if (rsc == NULL) { + } else if (rc < 0) { crm_notice("Not creating %s resource for a %s event " CRM_XS " transition key %s", ID(xml_rsc), operation, ID(input->xml)); @@ -1806,8 +1837,10 @@ do_lrm_invoke(long long action, /* Deleting something that does not exist is a success */ send_task_ok_ack(lrm_state, input, ID(xml_rsc), NULL, operation, from_host, from_sys); + return; + } - } else if (safe_str_eq(operation, CRMD_ACTION_CANCEL)) { + if (safe_str_eq(operation, CRMD_ACTION_CANCEL)) { if (!do_lrm_cancel(input, lrm_state, rsc, from_host, from_sys)) { crm_log_xml_warn(input->xml, "Bad command"); } diff --git a/crmd/lrm_state.c b/crmd/lrm_state.c index 1faf49db8..e18e809dd 100644 --- a/crmd/lrm_state.c +++ b/crmd/lrm_state.c @@ -684,20 +684,21 @@ lrm_state_register_rsc(lrm_state_t * lrm_state, const char *class, const char *provider, const char *agent, enum lrmd_call_options options) { - if (!lrm_state->conn) { + lrmd_t *conn = (lrmd_t *) lrm_state->conn; + + if (conn == NULL) { return -ENOTCONN; } - /* optimize this... this function is a synced round trip from client to daemon. - * The crmd/lrm.c code path should be re-factored to allow the register of resources - * to be performed async. The lrmd client api needs to make an async version - * of register available. */ if (is_remote_lrmd_ra(agent, provider, NULL)) { - return lrm_state_find_or_create(rsc_id) ? pcmk_ok : -1; + return lrm_state_find_or_create(rsc_id)? pcmk_ok : -EINVAL; } - return ((lrmd_t *) lrm_state->conn)->cmds->register_rsc(lrm_state->conn, rsc_id, class, - provider, agent, options); + /* @TODO Implement an asynchronous version of this (currently a blocking + * call to the lrmd). + */ + return conn->cmds->register_rsc(lrm_state->conn, rsc_id, class, provider, + agent, options); } int
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
