sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

res_corosync: reimplement "corosync show members" command. 

Reimplement the "corosync show members" CLI command using a CPG iterator
instead of the cpg_membership_get API call.  This will also show all
CPG members, including those in groups other than 'asterisk', which may
be useful at some point for debugging purposes.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@363045 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant 2012-04-21 11:40:42 +00:00
parent c870dad57e
commit 41826d203c
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
res/res_corosync.c
View File

@ -247,9 +247,8 @@ static void ast_event_cb(const struct ast_event *event, void *data)
static char *corosync_show_members(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
cs_error_t cs_err;
struct cpg_name name;
struct cpg_address member_list[CPG_MEMBERS_MAX] = { { 0, }, };
int num_members = CPG_MEMBERS_MAX;
cpg_iteration_handle_t cpg_iter;
struct cpg_iteration_description_t cpg_desc;
unsigned int i;
switch (cmd) {
@ -268,13 +267,10 @@ static char *corosync_show_members(struct ast_cli_entry *e, int cmd, struct ast_
return CLI_SHOWUSAGE;
}
ast_copy_string(name.value, "asterisk", sizeof(name.value));
name.length = strlen(name.value);
cs_err = cpg_membership_get(cpg_handle, &name, member_list, &num_members);
cs_err = cpg_iteration_initialize(cpg_handle, CPG_ITERATION_ALL, NULL, &cpg_iter);
if (cs_err != CS_OK) {
ast_cli(a->fd, "Failed to get membership list\n");
ast_cli(a->fd, "Failed to initialize CPG iterator.\n");
return CLI_FAILURE;
}
@ -282,23 +278,24 @@ static char *corosync_show_members(struct ast_cli_entry *e, int cmd, struct ast_
"=============================================================\n"
"=== Cluster members =========================================\n"
"=============================================================\n"
"===\n"
"=== Number of members: %d\n"
"===\n", num_members);
"===\n");
for (i = 0; i < num_members; i++) {
for (i = 1, cs_err = cpg_iteration_next(cpg_iter, &cpg_desc);
cs_err == CS_OK;
cs_err = cpg_iteration_next(cpg_iter, &cpg_desc), i++) {
corosync_cfg_node_address_t addrs[8];
int num_addrs = 0;
unsigned int j;
cs_err = corosync_cfg_get_node_addrs(cfg_handle, member_list[i].nodeid,
cs_err = corosync_cfg_get_node_addrs(cfg_handle, cpg_desc.nodeid,
ARRAY_LEN(addrs), &num_addrs, addrs);
if (cs_err != CS_OK) {
ast_log(LOG_WARNING, "Failed to get node addresses\n");
continue;
}
ast_cli(a->fd, "=== Node %d\n", i + 1);
ast_cli(a->fd, "=== Node %d\n", i);
ast_cli(a->fd, "=== --> Group: %s\n", cpg_desc.group.value);
for (j = 0; j < num_addrs; j++) {
struct sockaddr *sa = (struct sockaddr *) addrs[j].address;
@ -309,12 +306,15 @@ static char *corosync_show_members(struct ast_cli_entry *e, int cmd, struct ast_
ast_cli(a->fd, "=== --> Address %d: %s\n", j + 1, buf);
}
}
ast_cli(a->fd, "===\n"
"=============================================================\n"
"\n");
cpg_iteration_finalize(cpg_iter);
return CLI_SUCCESS;
}