diff options
author | Matt Jordan <mjordan@digium.com> | 2015-10-19 18:55:33 -0500 |
---|---|---|
committer | Matt Jordan <mjordan@digium.com> | 2016-07-13 09:11:37 -0500 |
commit | f12311ee696e4a623a4160aa0c2a83712088b5d3 (patch) | |
tree | d0a73289b9ae41a2eecc6ad3eef0caee799c9e4d /include/asterisk | |
parent | 73d8cb587d6515b707c9cafe334e18fbd7c24905 (diff) |
res/res_corosync: Raise a Stasis message on node join/leave events
When res_corosync detects that a node leaves or joins, it currently is
informed of this via Corosync callbacks. However, there are a few
limitations with the information presented:
(1) While we have information that Corosync is aware of - such as the
Corosync nodeid - that information is really only useful inside of
Corosync or res_corosync. There's no way to translate a Corosync
nodeid to some other internally useful unique identifier for the
Asterisk instance that just joined or left the cluster.
(2) While res_corosync is notified of the instance joining or leaving
the cluster, it has no mechanism to inform the Asterisk core or
other modules of this event. This limits the usefulness of res_corosync
as a heartbeat mechanism for other modules.
This patch addresses both issues.
First, it adds the notion of a cluster discovery message both within the
Stasis message bus, as well as the binary event messages that
res_corosync uses to transmit data back and forth within the cluster.
When Asterisk joins the cluster, it sends a discovery message to the other
nodes in the cluster, which correlates the Corosync nodeid along with
the Asterisk EID. res_corosync now maintains a hash of Corosync nodeids
to Asterisk EIDs, such that it can map changes in cluster state with the
Asterisk instance that has that nodeid. Likewise, when an Asterisk
instance receives a discovery message from a node in the cluster, it now
sends its own discovery message back to the originating node with the
local Asterisk EID. This lets Asterisk instances within the cluster
build a complete picture of the other Asterisk instances within the
cluster.
Second, it publishes the discovery messages onto the Stasis message bus.
Said messages are published whenever a node joins or leaves the cluster.
Interested modules can subscribe for the ast_cluster_discovery_type()
message under the ast_system_topic() and be notified when changes in
cluster state occur.
Change-Id: I9015f418d6ae7f47e4994e04e18948df4d49b465
Diffstat (limited to 'include/asterisk')
-rw-r--r-- | include/asterisk/event_defs.h | 13 | ||||
-rw-r--r-- | include/asterisk/stasis_system.h | 6 |
2 files changed, 17 insertions, 2 deletions
diff --git a/include/asterisk/event_defs.h b/include/asterisk/event_defs.h index 80a8d7dda..2d5c75a44 100644 --- a/include/asterisk/event_defs.h +++ b/include/asterisk/event_defs.h @@ -58,8 +58,10 @@ enum ast_event_type { AST_EVENT_ACL_CHANGE = 0x0b, /*! Send out a ping for debugging distributed events */ AST_EVENT_PING = 0x0c, + /*! A cluster discovery message */ + AST_EVENT_CLUSTER_DISCOVERY = 0x0d, /*! Number of event types. This should be the last event type + 1 */ - AST_EVENT_TOTAL = 0x0d, + AST_EVENT_TOTAL = 0x0e, }; /*! \brief Event Information Element types */ @@ -302,8 +304,15 @@ enum ast_event_ie_type { * Payload type: UINT */ AST_EVENT_IE_CACHABLE = 0x003d, + + /*! + * \brief Cluster node ID + * Used by: Corosync + * Payload type: UINT + */ + AST_EVENT_IE_NODE_ID = 0x003e, /*! \brief Must be the last IE value +1 */ - AST_EVENT_IE_TOTAL = 0x003e, + AST_EVENT_IE_TOTAL = 0x003f, }; /*! diff --git a/include/asterisk/stasis_system.h b/include/asterisk/stasis_system.h index 8c6e60f46..274c02e49 100644 --- a/include/asterisk/stasis_system.h +++ b/include/asterisk/stasis_system.h @@ -122,6 +122,12 @@ struct stasis_message_type *ast_cc_failure_type(void); struct stasis_message_type *ast_cc_monitorfailed_type(void); /*! + * \brief A \ref stasis_message_type for Cluster discovery + * \since 13.11.0 + */ +struct stasis_message_type *ast_cluster_discovery_type(void); + +/*! * \brief Initialize the stasis system topic and message types * \retval 0 on success * \retval -1 on failure |