FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.

» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > Redhat > Cluster Development
Reload this Page cluster/cman/daemon commands.c

 
 
LinkBack Thread Tools
 
Old 11-26-2007, 04:03 PM
 
Default cluster/cman/daemon commands.c
CVSROOT: /cvs/cluster
Module name: cluster
Branch: RHEL5
Changes by: lhh@sourceware.org 2007-11-26 17:03:00

Modified files:
cman/daemon : commands.c

Log message:
Ancillary patch to fix another case; bz #327721

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/commands.c.diff?cvsroot=cluster&only_with_tag=RHEL 5&r1=1.55.2.14&r2=1.55.2.15

--- cluster/cman/daemon/commands.c 2007/11/20 09:21:51 1.55.2.14
+++ cluster/cman/daemon/commands.c 2007/11/26 17:02:59 1.55.2.15
@@ -2021,6 +2021,7 @@

case NODESTATE_LEAVING:
node->state = NODESTATE_DEAD;
+ memset(&node->port_bits, 0, sizeof(node->port_bits));
cluster_members--;

if ((node->leave_reason & 0xF) & CLUSTER_LEAVEFLAG_REMOVED)
 
Old 01-02-2008, 08:27 AM
 
Default cluster/cman/daemon commands.c
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: pcaulfield@sourceware.org 2008-01-02 09:27:12

Modified files:
cman/daemon : commands.c

Log message:
totempg_ifaces_get() always copies INTERFACE_MAX addresses
so make sure we alloate enough space for them all.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/commands.c.diff?cvsroot=cluster&r1=1.77&r2=1.78

--- cluster/cman/daemon/commands.c 2007/12/05 14:28:58 1.77
+++ cluster/cman/daemon/commands.c 2008/01/02 09:27:12 1.78
@@ -345,7 +345,8 @@
int addrlen=0;
unsigned int numaddrs=1;
char **status;
- struct totem_ip_address node_ifs[num_interfaces];
+ struct totem_ip_address node_ifs[INTERFACE_MAX];
+ /* totempg_ifaces_get always copies INTERFACE_MAX addresses */

strcpy(unode->name, node->name);
unode->jointime = node->join_time;
@@ -361,7 +362,6 @@
must ask for them */
totempg_ifaces_get(node->node_id, node_ifs, &status, &numaddrs);

-
totemip_totemip_to_sockaddr_convert(&node_ifs[0], 0, &ss, &addrlen);
memcpy(unode->addr, &ss, addrlen);
unode->addrlen = addrlen;
@@ -1173,7 +1173,7 @@
int i;
char *outbuf = *retbuf + offset;
struct cl_get_node_addrs *addrs = (struct cl_get_node_addrs *)outbuf;
- struct totem_ip_address node_ifs[num_interfaces];
+ struct totem_ip_address node_ifs[INTERFACE_MAX]; /* totempg_ifaces_get always copies INTERFACE_MAX addresses */
struct cluster_node *node;
char **status;
 
Old 01-02-2008, 09:02 AM
 
Default cluster/cman/daemon commands.c
CVSROOT: /cvs/cluster
Module name: cluster
Branch: RHEL5
Changes by: pcaulfield@sourceware.org 2008-01-02 10:02:44

Modified files:
cman/daemon : commands.c

Log message:
totempg_ifaces_get() always copies INTERFACE_MAX addresses
so make sure we allocate enough space for them all.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/commands.c.diff?cvsroot=cluster&only_with_tag=RHEL 5&r1=1.55.2.15&r2=1.55.2.16

--- cluster/cman/daemon/commands.c 2007/11/26 17:02:59 1.55.2.15
+++ cluster/cman/daemon/commands.c 2008/01/02 10:02:44 1.55.2.16
@@ -2,7 +2,7 @@
************************************************** *****************************
**
** Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved.
-** Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved.
+** Copyright (C) 2004-2008 Red Hat, Inc. All rights reserved.
**
** This copyrighted material is made available to anyone wishing to use,
** modify, copy, or redistribute it subject to the terms and conditions
@@ -343,7 +343,7 @@
int addrlen=0;
unsigned int numaddrs=1;
char **status;
- struct totem_ip_address node_ifs[num_interfaces];
+ struct totem_ip_address node_ifs[INTERFACE_MAX];

strcpy(unode->name, node->name);
unode->jointime = node->join_time;
@@ -1150,7 +1150,7 @@
int i;
char *outbuf = *retbuf + offset;
struct cl_get_node_addrs *addrs = (struct cl_get_node_addrs *)outbuf;
- struct totem_ip_address node_ifs[num_interfaces];
+ struct totem_ip_address node_ifs[INTERFACE_MAX];
struct cluster_node *node;
char **status;
 
Old 01-02-2008, 03:23 PM
 
Default cluster/cman/daemon commands.c
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: pcaulfield@sourceware.org 2008-01-02 16:23:29

Modified files:
cman/daemon : commands.c

Log message:
Lets see if I can do this commit properly...
Fix swab of an int to be swab32 rather than swab16

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/commands.c.diff?cvsroot=cluster&r1=1.78&r2=1.79

--- cluster/cman/daemon/commands.c 2008/01/02 09:27:12 1.78
+++ cluster/cman/daemon/commands.c 2008/01/02 16:23:28 1.79
@@ -1627,7 +1627,7 @@
case CLUSTER_MSG_KILLNODE:
killmsg = (struct cl_killmsg *)data;
killmsg->reason = swab16(killmsg->reason);
- killmsg->nodeid = swab16(killmsg->nodeid);
+ killmsg->nodeid = swab32(killmsg->nodeid);
break;

case CLUSTER_MSG_LEAVE:
 
Old 01-03-2008, 05:48 AM
 
Default cluster/cman/daemon commands.c
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: fabbione@sourceware.org 2008-01-03 06:48:12

Modified files:
cman/daemon : commands.c

Log message:
Fix buffer align. So far this one makes the entire stack run on sparc
up to fenced.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/commands.c.diff?cvsroot=cluster&r1=1.80&r2=1.81

--- cluster/cman/daemon/commands.c 2008/01/02 16:35:44 1.80
+++ cluster/cman/daemon/commands.c 2008/01/03 06:48:12 1.81
@@ -1555,7 +1555,7 @@

void send_transition_msg(int last_memb_count, int first_trans)
{
- char buf[sizeof(struct cl_transmsg)+1024];
+ char buf[sizeof(struct cl_transmsg)+1024] __attribute__((aligned(8)));
struct cl_transmsg *msg = (struct cl_transmsg *)buf;
int len = sizeof(struct cl_transmsg);
 
Old 01-03-2008, 03:35 PM
 
Default cluster/cman/daemon commands.c
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: pcaulfield@sourceware.org 2008-01-03 16:35:55

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&r1=1.81&r2=1.82

--- cluster/cman/daemon/commands.c 2008/01/03 06:48:12 1.81
+++ cluster/cman/daemon/commands.c 2008/01/03 16:35:54 1.82
@@ -1955,23 +1955,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_printf(LOG_ERR, "Error, can't find IP address and no nodeid for node %s - ignoring it
", nodename);
- return;
- }
- else {
- log_printf(LOG_WARNING, "Warning, can't resolve IP address for node %s
", 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)
 
Old 01-03-2008, 03:36 PM
 
Default cluster/cman/daemon commands.c
CVSROOT: /cvs/cluster
Module name: cluster
Branch: RHEL5
Changes by: pcaulfield@sourceware.org 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=RHEL 5&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
", nodename);
- return;
- }
- else {
- log_msg(LOG_WARNING, "Warning, can't resolve IP address for node %s
", 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)
 
Old 01-03-2008, 07:40 PM
"Fabio M. Di Nitto"
 
Default cluster/cman/daemon commands.c
On Thu, 3 Jan 2008, pcaulfield@sourceware.org wrote:


CVSROOT: /cvs/cluster
Module name: cluster
Changes by: pcaulfield@sourceware.org 2008-01-03 16:35:55

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.


ahhh thanks about this one. I did test a few start/stop of the entire
cluster and no problems at all.


Fabio

--
I'm going to make him an offer he can't refuse.
 
Old 02-04-2008, 09:54 AM
 
Default cluster/cman/daemon commands.c
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: pcaulfield@sourceware.org 2008-02-04 10:54:26

Modified files:
cman/daemon : commands.c

Log message:
Change a log_printf() into a syslog() so that the die message
always arrives in the log.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/commands.c.diff?cvsroot=cluster&r1=1.82&r2=1.83

--- cluster/cman/daemon/commands.c 2008/01/03 16:35:54 1.82
+++ cluster/cman/daemon/commands.c 2008/02/04 10:54:26 1.83
@@ -1889,7 +1889,8 @@
killmsg = (struct cl_killmsg *)data;
P_MEMB("got KILL for node %d
", killmsg->nodeid);
if (killmsg->nodeid == wanted_nodeid) {
- log_printf(LOG_INFO, "cman killed by node %d because %s
", nodeid,
+ /* Must use syslog directly here or the message will never arrive */
+ syslog(LOG_CRIT, "cman killed by node %d because %s
", nodeid,
killmsg_reason(killmsg->reason));
exit(1);
}
 

Thread Tools




All times are GMT. The time now is 02:51 PM.

VBulletin, Copyright ©2000 - 2013, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright ©2007 - 2008, www.linux-archive.org

Contact Us - Linux Archive - Archive - Top -