Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
ocfs2/cluster: Maintain live node bitmap per heartbeat region

Currently we track a global livenode bitmap that keeps track of all nodes
that are heartbeating in all regions.

This patch adds the ability to track the livenode bitmap on a per region basis.
We will use this facility in a later patch to allow us to withstand the loss of
a minority number of regions.

Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
  • Loading branch information
Sunil Mushran committed Oct 7, 2010
1 parent 8ca8b0b commit 823a637
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions fs/ocfs2/cluster/heartbeat.c
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,9 @@ struct o2hb_region {
struct block_device *hr_bdev;
struct o2hb_disk_slot *hr_slots;

/* live node map of this region */
unsigned long hr_live_node_bitmap[BITS_TO_LONGS(O2NM_MAX_NODES)];

/* let the person setting up hb wait for it to return until it
* has reached a 'steady' state. This will be fixed when we have
* a more complete api that doesn't lead to this sort of fragility. */
Expand Down Expand Up @@ -688,6 +691,8 @@ static int o2hb_check_slot(struct o2hb_region *reg,
mlog(ML_HEARTBEAT, "Node %d (id 0x%llx) joined my region\n",
slot->ds_node_num, (long long)slot->ds_last_generation);

set_bit(slot->ds_node_num, reg->hr_live_node_bitmap);

/* first on the list generates a callback */
if (list_empty(&o2hb_live_slots[slot->ds_node_num])) {
set_bit(slot->ds_node_num, o2hb_live_node_bitmap);
Expand Down Expand Up @@ -733,6 +738,8 @@ static int o2hb_check_slot(struct o2hb_region *reg,
mlog(ML_HEARTBEAT, "Node %d left my region\n",
slot->ds_node_num);

clear_bit(slot->ds_node_num, reg->hr_live_node_bitmap);

/* last off the live_slot generates a callback */
list_del_init(&slot->ds_live_item);
if (list_empty(&o2hb_live_slots[slot->ds_node_num])) {
Expand Down

0 comments on commit 823a637

Please sign in to comment.