|
@@ -269,16 +269,11 @@ static void recover_prep(void *arg)
|
|
|
set_bit(MD_CLUSTER_SUSPEND_READ_BALANCING, &cinfo->state);
|
|
|
}
|
|
|
|
|
|
-static void recover_slot(void *arg, struct dlm_slot *slot)
|
|
|
+static void __recover_slot(struct mddev *mddev, int slot)
|
|
|
{
|
|
|
- struct mddev *mddev = arg;
|
|
|
struct md_cluster_info *cinfo = mddev->cluster_info;
|
|
|
|
|
|
- pr_info("md-cluster: %s Node %d/%d down. My slot: %d. Initiating recovery.\n",
|
|
|
- mddev->bitmap_info.cluster_name,
|
|
|
- slot->nodeid, slot->slot,
|
|
|
- cinfo->slot_number);
|
|
|
- set_bit(slot->slot - 1, &cinfo->recovery_map);
|
|
|
+ set_bit(slot, &cinfo->recovery_map);
|
|
|
if (!cinfo->recovery_thread) {
|
|
|
cinfo->recovery_thread = md_register_thread(recover_bitmaps,
|
|
|
mddev, "recover");
|
|
@@ -290,6 +285,20 @@ static void recover_slot(void *arg, struct dlm_slot *slot)
|
|
|
md_wakeup_thread(cinfo->recovery_thread);
|
|
|
}
|
|
|
|
|
|
+static void recover_slot(void *arg, struct dlm_slot *slot)
|
|
|
+{
|
|
|
+ struct mddev *mddev = arg;
|
|
|
+ struct md_cluster_info *cinfo = mddev->cluster_info;
|
|
|
+
|
|
|
+ pr_info("md-cluster: %s Node %d/%d down. My slot: %d. Initiating recovery.\n",
|
|
|
+ mddev->bitmap_info.cluster_name,
|
|
|
+ slot->nodeid, slot->slot,
|
|
|
+ cinfo->slot_number);
|
|
|
+ /* deduct one since dlm slot starts from one while the num of
|
|
|
+ * cluster-md begins with 0 */
|
|
|
+ __recover_slot(mddev, slot->slot - 1);
|
|
|
+}
|
|
|
+
|
|
|
static void recover_done(void *arg, struct dlm_slot *slots,
|
|
|
int num_slots, int our_slot,
|
|
|
uint32_t generation)
|