Fix: crmadmin: return error if DC is not elected #2902 #3606 #3716
Conversation
aleksei-burlakov
force-pushed
the
fix-crmadmin-dclookup-return-undetermined
branch
from
a35d796 to
aac55a2
Compare
lib/pacemaker/pcmk_cluster_queries.c
Outdated
| @@ -234,8 +234,7 @@ designated_controller_event_cb(pcmk_ipc_api_t *controld_api, | |||
| } | |||
|
|
|||
| reply = (const pcmk_controld_api_reply_t *) event_data; | |||
| out->message(out, "dc", reply->host_from); | |||
| data->rc = pcmk_rc_ok; | |||
| data->rc = out->message(out, "dc", reply->host_from); | |||
There was a problem hiding this comment.
A message's return value should indicate only whether the message could be successfully output. We can set data->rc directly based on whether host_from is NULL.
If I follow correctly, this would change crmadmin's exit status from CRM_EX_OK to CRM_EX_INDETERMINATE ("Could not determine status")? If so, I think CRM_EX_NOSUCH ("No such object") might be better, since we could definitively determine that there is no DC. Alternatively, we could create a new rc and exit code for "DC not elected yet".
aleksei-burlakov
force-pushed
the
fix-crmadmin-dclookup-return-undetermined
branch
from
aac55a2 to
2f31653
Compare
…sterLabs#3606 If the DC is not yet elected, the crmadmin will return an error. (This change complements ClusterLabs#3606).
aleksei-burlakov
force-pushed
the
fix-crmadmin-dclookup-return-undetermined
branch
from
2f31653 to
f0471b5
Compare
| @@ -273,6 +273,7 @@ typedef enum crm_exit_e { | |||
| CRM_EX_NOT_YET_IN_EFFECT = 111, //!< Requested item is not in effect | |||
| CRM_EX_INDETERMINATE = 112, //!< Could not determine status | |||
| CRM_EX_UNSATISFIED = 113, //!< Requested item does not satisfy constraints | |||
| CRM_EX_DC_NOT_ELECTED_YET = 114, //!< DC is not yet elected, e.g. right after cluster restart | |||
There was a problem hiding this comment.
For brevity, let's use CRM_EX_NO_DC
| @@ -235,7 +235,7 @@ designated_controller_event_cb(pcmk_ipc_api_t *controld_api, | |||
|
|
|||
| reply = (const pcmk_controld_api_reply_t *) event_data; | |||
| out->message(out, "dc", reply->host_from); | |||
| data->rc = pcmk_rc_ok; | |||
| data->rc = reply->host_from ? pcmk_rc_ok : CRM_EX_DC_NOT_ELECTED_YET; | |||
There was a problem hiding this comment.
Whoops, I'm a little slow this morning ... data->rc is a return code, not an exit code. It will get mapped to an exit code by crmadmin.
We need a new pcmk_rc_no_dc return code in enum pcmk_rc_e in include/crm/common/results.h, and then pcmk_rc2exitc() can map it to CRM_EX_NO_DC.
If the DC is not yet elected, the crmadmin will return an error. (This change complements #3606).