CVSROOT: /cvs/cluster
Module name: cluster
Branch: RHEL5
Changes by: [EMAIL PROTECTED] 2008-01-03 16:36:52
Modified files:
cman/daemon : commands.c
Log message:
Get rid of redundant totemip_parse() call. This was in a bad place and
could
cause aisexec stalls and disallowed nodes, particularly at startup.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/commands.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.55.2.16&r2=1.55.2.17
--- cluster/cman/daemon/commands.c 2008/01/02 10:02:44 1.55.2.16
+++ cluster/cman/daemon/commands.c 2008/01/03 16:36:51 1.55.2.17
@@ -1924,23 +1924,8 @@
/* Add a node from CCS, note that it may already exist if user has simply
updated the config file */
void add_ccs_node(char *nodename, int nodeid, int votes, int expected_votes)
{
- struct totem_ip_address ipaddr;
- struct cluster_node *node;
-
- if (totemip_parse(&ipaddr, nodename, 0))
- {
- if (!nodeid) {
- log_msg(LOG_ERR, "Error, can't find IP address and no
nodeid for node %s - ignoring it\n", nodename);
- return;
- }
- else {
- log_msg(LOG_WARNING, "Warning, can't resolve IP address
for node %s\n", nodename);
- memset(&ipaddr, 0, sizeof(ipaddr));
- }
- }
-
/* Update node entry */
- node = add_new_node(nodename, nodeid, votes, expected_votes,
NODESTATE_DEAD);
+ add_new_node(nodename, nodeid, votes, expected_votes, NODESTATE_DEAD);
}
void add_ais_node(int nodeid, uint64_t incarnation, int total_members)
