From 84ae2314faeff2a9e06a66bc9a79520eadcbf305 Mon Sep 17 00:00:00 2001 From: Nick Wang Date: Fri, 10 Jul 2015 17:28:18 +0800 Subject: [Patch v2 02/10] drbd: Add option zap_devices to new-current-uuid Using zeroing out device instead of initial full sync of device. Can be useful in high latency network environment. Signed-off-by: Nick Wang CC: Philipp Reisner CC: Lars Ellenberg CC: drbd-dev@lists.linbit.com CC: linux-kernel@vger.kernel.org --- drbd/drbd_nl.c | 9 +++++++++ drbd/linux/drbd_genl.h | 1 + 2 files changed, 10 insertions(+) diff --git a/drbd/drbd_nl.c b/drbd/drbd_nl.c index 691b615..1d17663 100644 --- a/drbd/drbd_nl.c +++ b/drbd/drbd_nl.c @@ -4017,6 +4017,7 @@ int drbd_adm_new_c_uuid(struct sk_buff *skb, struct genl_info *info) struct drbd_device *device; enum drbd_ret_code retcode; int skip_initial_sync = 0; + int zero_out_devices = 0; int err; struct new_c_uuid_parms args; @@ -4051,6 +4052,14 @@ int drbd_adm_new_c_uuid(struct sk_buff *skb, struct genl_info *info) device->ldev->md.uuid[UI_CURRENT] == UUID_JUST_CREATED && args.clear_bm) { drbd_info(device, "Preparing to skip initial sync\n"); skip_initial_sync = 1; + /* this is "zero out" devices to make it all zero. + * ignore "zero out" if both "clear_bm" and "zap_devices" set. */ + } else if (device->state.conn == C_CONNECTED && + first_peer_device(device)->connection->agreed_pro_version >= 90 && + device->ldev->md.uuid[UI_CURRENT] == UUID_JUST_CREATED && + args.zap_devices) { + drbd_info(device, "Preparing to zero out devices, will take a long time\n"); + zero_out_devices = 1; } else if (device->state.conn != C_STANDALONE) { retcode = ERR_CONNECTED; goto out_dec; diff --git a/drbd/linux/drbd_genl.h b/drbd/linux/drbd_genl.h index 5db53f5..eef8d8c 100644 --- a/drbd/linux/drbd_genl.h +++ b/drbd/linux/drbd_genl.h @@ -240,6 +240,7 @@ GENL_struct(DRBD_NLA_START_OV_PARMS, 9, start_ov_parms, GENL_struct(DRBD_NLA_NEW_C_UUID_PARMS, 10, new_c_uuid_parms, __flg_field(1, DRBD_GENLA_F_MANDATORY, clear_bm) + __flg_field(2, DRBD_GENLA_F_MANDATORY, zap_devices) ) GENL_struct(DRBD_NLA_TIMEOUT_PARMS, 11, timeout_parms, -- 1.8.4.5