* [Cluster-devel] [PATCH] cman: Don't increment on LEAVING->MEMBER transition
@ 2010-12-07 15:13 Lon Hohberger
0 siblings, 0 replies; 4+ messages in thread
From: Lon Hohberger @ 2010-12-07 15:13 UTC (permalink / raw)
To: cluster-devel.redhat.com
If a node left the cluster prior using 'cman_tool leave', its
internal state is set to NODESTATE_LEAVING.
Ordinarily, during the transition from NODESTATE_LEAVING to
NODESTATE_DEAD, the member count is decremented. However, it
is possible to rejoin the cluster membership from the
NODESTATE_LEAVING state.
If this occurs, the cluster member count is incremented, but
since the node never transitioned from LEAVING->DEAD, it was
not previously decremented, causing an ever-increasing node
count in 'cman_tool status'.
This patch resolves the issue by not incrementing the member
count during a LEAVING->MEMBER transition.
Resolves: rhbz#649533
Signed-off-by: Lon Hohberger <lhh@redhat.com>
---
cman/daemon/commands.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/cman/daemon/commands.c b/cman/daemon/commands.c
index d4d9fd9..e62f33c 100644
--- a/cman/daemon/commands.c
+++ b/cman/daemon/commands.c
@@ -2245,10 +2245,13 @@ void add_ais_node(int nodeid, uint64_t incar, int total_members)
if (node->state == NODESTATE_DEAD || node->state == NODESTATE_LEAVING) {
gettimeofday(&node->join_time, NULL);
+ /* If a node rejoins before it completes a leave,
+ * we should not increment cluster_members */
+ if (node->state != NODESTATE_LEAVING)
+ cluster_members++;
node->incarnation = incar;
node->state = NODESTATE_MEMBER;
node->leave_reason = 0;
- cluster_members++;
recalculate_quorum(0, 0);
}
}
--
1.7.2.3
^ permalink raw reply related [flat|nested] 4+ messages in thread* [Cluster-devel] [PATCH] cman: Don't increment on LEAVING->MEMBER transition
@ 2011-03-22 1:06 Lon Hohberger
2011-03-22 8:33 ` Fabio M. Di Nitto
0 siblings, 1 reply; 4+ messages in thread
From: Lon Hohberger @ 2011-03-22 1:06 UTC (permalink / raw)
To: cluster-devel.redhat.com
If a node left the cluster prior using 'cman_tool leave', its
internal state is set to NODESTATE_LEAVING.
Ordinarily, during the transition from NODESTATE_LEAVING to
NODESTATE_DEAD, the member count is decremented. However, it
is possible to rejoin the cluster membership from the
NODESTATE_LEAVING state.
If this occurs, the cluster member count is incremented, but
since the node never transitioned from LEAVING->DEAD, it was
not previously decremented, causing an ever-increasing node
count in 'cman_tool status'.
This patch resolves the issue by not incrementing the member
count during a LEAVING->MEMBER transition.
Resolves: rhbz#649533
Signed-off-by: Lon Hohberger <lhh@redhat.com>
---
cman/daemon/commands.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/cman/daemon/commands.c b/cman/daemon/commands.c
index 6ffe9e5..6c91d7a 100644
--- a/cman/daemon/commands.c
+++ b/cman/daemon/commands.c
@@ -1994,9 +1994,12 @@ void add_ais_node(int nodeid, uint64_t incarnation, int total_members)
if (node->state == NODESTATE_DEAD || node->state == NODESTATE_LEAVING) {
gettimeofday(&node->join_time, NULL);
+ /* If a node rejoins before it completes a leave,
+ * we should not increment cluster_members */
+ if (node->state != NODESTATE_LEAVING)
+ cluster_members++;
node->incarnation = incarnation;
node->state = NODESTATE_MEMBER;
- cluster_members++;
recalculate_quorum(0, 0);
}
}
--
1.7.2.3
^ permalink raw reply related [flat|nested] 4+ messages in thread* [Cluster-devel] [PATCH] cman: Don't increment on LEAVING->MEMBER transition
2011-03-22 1:06 Lon Hohberger
@ 2011-03-22 8:33 ` Fabio M. Di Nitto
2011-03-22 10:28 ` Christine Caulfield
0 siblings, 1 reply; 4+ messages in thread
From: Fabio M. Di Nitto @ 2011-03-22 8:33 UTC (permalink / raw)
To: cluster-devel.redhat.com
The patch looks sane to me and I am fairly sure it needs to be applied
to STABLE31/RHEL6 too.
I?d like also an ACK from Chrissie here.
Fabio
On 3/22/2011 2:06 AM, Lon Hohberger wrote:
> If a node left the cluster prior using 'cman_tool leave', its
> internal state is set to NODESTATE_LEAVING.
>
> Ordinarily, during the transition from NODESTATE_LEAVING to
> NODESTATE_DEAD, the member count is decremented. However, it
> is possible to rejoin the cluster membership from the
> NODESTATE_LEAVING state.
>
> If this occurs, the cluster member count is incremented, but
> since the node never transitioned from LEAVING->DEAD, it was
> not previously decremented, causing an ever-increasing node
> count in 'cman_tool status'.
>
> This patch resolves the issue by not incrementing the member
> count during a LEAVING->MEMBER transition.
>
> Resolves: rhbz#649533
>
> Signed-off-by: Lon Hohberger <lhh@redhat.com>
> ---
> cman/daemon/commands.c | 5 ++++-
> 1 files changed, 4 insertions(+), 1 deletions(-)
>
> diff --git a/cman/daemon/commands.c b/cman/daemon/commands.c
> index 6ffe9e5..6c91d7a 100644
> --- a/cman/daemon/commands.c
> +++ b/cman/daemon/commands.c
> @@ -1994,9 +1994,12 @@ void add_ais_node(int nodeid, uint64_t incarnation, int total_members)
>
> if (node->state == NODESTATE_DEAD || node->state == NODESTATE_LEAVING) {
> gettimeofday(&node->join_time, NULL);
> + /* If a node rejoins before it completes a leave,
> + * we should not increment cluster_members */
> + if (node->state != NODESTATE_LEAVING)
> + cluster_members++;
> node->incarnation = incarnation;
> node->state = NODESTATE_MEMBER;
> - cluster_members++;
> recalculate_quorum(0, 0);
> }
> }
^ permalink raw reply [flat|nested] 4+ messages in thread* [Cluster-devel] [PATCH] cman: Don't increment on LEAVING->MEMBER transition
2011-03-22 8:33 ` Fabio M. Di Nitto
@ 2011-03-22 10:28 ` Christine Caulfield
0 siblings, 0 replies; 4+ messages in thread
From: Christine Caulfield @ 2011-03-22 10:28 UTC (permalink / raw)
To: cluster-devel.redhat.com
On 22/03/11 08:33, Fabio M. Di Nitto wrote:
> The patch looks sane to me and I am fairly sure it needs to be applied
> to STABLE31/RHEL6 too.
>
> I?d like also an ACK from Chrissie here.
ACK
Chrissie
> Fabio
>
> On 3/22/2011 2:06 AM, Lon Hohberger wrote:
>> If a node left the cluster prior using 'cman_tool leave', its
>> internal state is set to NODESTATE_LEAVING.
>>
>> Ordinarily, during the transition from NODESTATE_LEAVING to
>> NODESTATE_DEAD, the member count is decremented. However, it
>> is possible to rejoin the cluster membership from the
>> NODESTATE_LEAVING state.
>>
>> If this occurs, the cluster member count is incremented, but
>> since the node never transitioned from LEAVING->DEAD, it was
>> not previously decremented, causing an ever-increasing node
>> count in 'cman_tool status'.
>>
>> This patch resolves the issue by not incrementing the member
>> count during a LEAVING->MEMBER transition.
>>
>> Resolves: rhbz#649533
>>
>> Signed-off-by: Lon Hohberger<lhh@redhat.com>
>> ---
>> cman/daemon/commands.c | 5 ++++-
>> 1 files changed, 4 insertions(+), 1 deletions(-)
>>
>> diff --git a/cman/daemon/commands.c b/cman/daemon/commands.c
>> index 6ffe9e5..6c91d7a 100644
>> --- a/cman/daemon/commands.c
>> +++ b/cman/daemon/commands.c
>> @@ -1994,9 +1994,12 @@ void add_ais_node(int nodeid, uint64_t incarnation, int total_members)
>>
>> if (node->state == NODESTATE_DEAD || node->state == NODESTATE_LEAVING) {
>> gettimeofday(&node->join_time, NULL);
>> + /* If a node rejoins before it completes a leave,
>> + * we should not increment cluster_members */
>> + if (node->state != NODESTATE_LEAVING)
>> + cluster_members++;
>> node->incarnation = incarnation;
>> node->state = NODESTATE_MEMBER;
>> - cluster_members++;
>> recalculate_quorum(0, 0);
>> }
>> }
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-03-22 10:28 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-07 15:13 [Cluster-devel] [PATCH] cman: Don't increment on LEAVING->MEMBER transition Lon Hohberger
-- strict thread matches above, loose matches on Subject: below --
2011-03-22 1:06 Lon Hohberger
2011-03-22 8:33 ` Fabio M. Di Nitto
2011-03-22 10:28 ` Christine Caulfield
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).