Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=9b8e381474c4e7... Commit: 9b8e381474c4e7fcbdb192b516cb5a0dd41b1730 Parent: be46b108112a4a5027bba42a4b54d619743c7b82 Author: Christine Caulfield ccaulfie@redhat.com AuthorDate: Thu Jan 14 09:53:44 2016 +0000 Committer: Christine Caulfield ccaulfie@redhat.com CommitterDate: Thu Jan 14 09:53:44 2016 +0000
cman: Properly check for votes when node names aren't specified
Signed-off-by: Ken Gaillot kgaillot@redhat.com Reviewed-by: Christine Caulfield ccaulfie@redhat.com --- cman/daemon/cmanconfig.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cman/daemon/cmanconfig.c b/cman/daemon/cmanconfig.c index d6758e6..ca95609 100644 --- a/cman/daemon/cmanconfig.c +++ b/cman/daemon/cmanconfig.c @@ -229,7 +229,7 @@ static int get_cman_join_info(struct corosync_api_v1 *corosync) }
node_object = nodelist_byname(corosync, cluster_parent_handle, our_nodename); - if (!node_object) { + if (!votes && !node_object) { log_printf(LOG_ERR, "unable to find votes for %s", our_nodename); write_cman_pipe("Unable to find votes for node in CCS"); return -E2BIG;
cluster-commits@lists.fedorahosted.org