Send RESYNCING while performing resync start/stop

When a resync is initiated, RESYNCING message is sent to all active
nodes with the range (lo,hi). When the resync is over, a RESYNCING
message is sent with (0,0). A high sector value of zero indicates
that the resync is over.

Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>

diff --git a/drivers/md/md-cluster.c b/drivers/md/md-cluster.c
index 7e419f05b5688ff7b8071e0fe9341781e93c788c..6428cc3ce38d34f47e5714b0a29cbe757790fe65 100644 (file)
--- a/drivers/md/md-cluster.c
+++ b/drivers/md/md-cluster.c
@@ -647,11 +647,43 @@ static int metadata_update_cancel(struct mddev *mddev)
        return dlm_unlock_sync(cinfo->token_lockres);
 }
 
+static int resync_send(struct mddev *mddev, enum msg_type type,
+               sector_t lo, sector_t hi)
+{
+       struct md_cluster_info *cinfo = mddev->cluster_info;
+       struct cluster_msg cmsg;
+       int slot = cinfo->slot_number - 1;
+
+       pr_info("%s:%d lo: %llu hi: %llu\n", __func__, __LINE__,
+                       (unsigned long long)lo,
+                       (unsigned long long)hi);
+       resync_info_update(mddev, lo, hi);
+       cmsg.type = cpu_to_le32(type);
+       cmsg.slot = cpu_to_le32(slot);
+       cmsg.low = cpu_to_le64(lo);
+       cmsg.high = cpu_to_le64(hi);
+       return sendmsg(cinfo, &cmsg);
+}
+
+static int resync_start(struct mddev *mddev, sector_t lo, sector_t hi)
+{
+       pr_info("%s:%d\n", __func__, __LINE__);
+       return resync_send(mddev, RESYNCING, lo, hi);
+}
+
+static void resync_finish(struct mddev *mddev)
+{
+       pr_info("%s:%d\n", __func__, __LINE__);
+       resync_send(mddev, RESYNCING, 0, 0);
+}
+
 static struct md_cluster_operations cluster_ops = {
        .join   = join,
        .leave  = leave,
        .slot_number = slot_number,
        .resync_info_update = resync_info_update,
+       .resync_start = resync_start,
+       .resync_finish = resync_finish,
        .metadata_update_start = metadata_update_start,
        .metadata_update_finish = metadata_update_finish,
        .metadata_update_cancel = metadata_update_cancel,

diff --git a/drivers/md/md-cluster.h b/drivers/md/md-cluster.h
index 658982afcf9b6be1693c26bb33c61ce849576c58..054f9eafa065769582e312f538370bf9bb9dcc5a 100644 (file)
--- a/drivers/md/md-cluster.h
+++ b/drivers/md/md-cluster.h
@@ -12,6 +12,8 @@ struct md_cluster_operations {
        int (*leave)(struct mddev *mddev);
        int (*slot_number)(struct mddev *mddev);
        void (*resync_info_update)(struct mddev *mddev, sector_t lo, sector_t hi);
+       int (*resync_start)(struct mddev *mddev, sector_t lo, sector_t hi);
+       void (*resync_finish)(struct mddev *mddev);
        int (*metadata_update_start)(struct mddev *mddev);
        int (*metadata_update_finish)(struct mddev *mddev);
        int (*metadata_update_cancel)(struct mddev *mddev);

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 3eb45dc0537f9114d7a50d931bbcbae3a4cf034f..a1af24d369fc8f87069e67942f3d2dcbf81e173d 100644 (file)
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -7692,7 +7692,7 @@ void md_do_sync(struct md_thread *thread)
        update_time = jiffies;
 
        if (mddev_is_clustered(mddev))
-               md_cluster_ops->resync_info_update(mddev, j, max_sectors);
+               md_cluster_ops->resync_start(mddev, j, max_sectors);
 
        blk_start_plug(&plug);
        while (j < max_sectors) {
@@ -7817,7 +7817,7 @@ void md_do_sync(struct md_thread *thread)
        mddev->pers->sync_request(mddev, max_sectors, &skipped, 1);
 
        if (mddev_is_clustered(mddev))
-               md_cluster_ops->resync_info_update(mddev, 0, 0);
+               md_cluster_ops->resync_finish(mddev);
 
        if (!test_bit(MD_RECOVERY_CHECK, &mddev->recovery) &&
            mddev->curr_resync > 2) {