From: Philipp Reisner <philipp.reisner@linbit.com>
To: linux-kernel@vger.kernel.org, Jens Axboe <axboe@kernel.dk>
Cc: drbd-dev@lists.linbit.com,
Philipp Reisner <philipp.reisner@linbit.com>,
Lars Ellenberg <lars.ellenberg@linbit.com>
Subject: [PATCH 06/17] drbd: drop now useless duplicate state request from invalidate
Date: Wed, 27 Mar 2013 14:08:38 +0100 [thread overview]
Message-ID: <1364389729-17559-7-git-send-email-philipp.reisner@linbit.com> (raw)
In-Reply-To: <1364389729-17559-1-git-send-email-philipp.reisner@linbit.com>
Patch best viewed with git diff --ignore-space-change.
Now that we attempt the fallback to local bitmap operation
only when disconnected, we can safely drop the extra "silent"
state request from both invalidate and invalidate-remote.
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
---
drivers/block/drbd/drbd_nl.c | 62 +++++++++++++++++++-----------------------
1 file changed, 28 insertions(+), 34 deletions(-)
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index c49bda7..56bafdc 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -2446,26 +2446,19 @@ int drbd_adm_invalidate(struct sk_buff *skb, struct genl_info *info)
wait_event(mdev->misc_wait, !test_bit(BITMAP_IO, &mdev->flags));
drbd_flush_workqueue(mdev);
- retcode = _drbd_request_state(mdev, NS(conn, C_STARTING_SYNC_T), CS_ORDERED);
-
- /* If that did not work, try again,
- * but log failures this time (implicit CS_VERBOSE).
- *
- * If we happen to be C_STANDALONE R_SECONDARY,
- * just change to D_INCONSISTENT, and set all bits in the bitmap.
- * Otherwise, we just fail, to avoid races with the resync handshake.
+ /* If we happen to be C_STANDALONE R_SECONDARY, just change to
+ * D_INCONSISTENT, and set all bits in the bitmap. Otherwise,
+ * try to start a resync handshake as sync target for full sync.
*/
- if (retcode < SS_SUCCESS) {
- if (mdev->state.conn == C_STANDALONE && mdev->state.role == R_SECONDARY) {
- retcode = drbd_request_state(mdev, NS(disk, D_INCONSISTENT));
- if (retcode >= SS_SUCCESS) {
- if (drbd_bitmap_io(mdev, &drbd_bmio_set_n_write,
- "set_n_write from invalidate", BM_LOCKED_MASK))
- retcode = ERR_IO_MD_DISK;
- }
- } else
- retcode = drbd_request_state(mdev, NS(conn, C_STARTING_SYNC_T));
- }
+ if (mdev->state.conn == C_STANDALONE && mdev->state.role == R_SECONDARY) {
+ retcode = drbd_request_state(mdev, NS(disk, D_INCONSISTENT));
+ if (retcode >= SS_SUCCESS) {
+ if (drbd_bitmap_io(mdev, &drbd_bmio_set_n_write,
+ "set_n_write from invalidate", BM_LOCKED_MASK))
+ retcode = ERR_IO_MD_DISK;
+ }
+ } else
+ retcode = drbd_request_state(mdev, NS(conn, C_STARTING_SYNC_T));
drbd_resume_io(mdev);
out:
@@ -2519,21 +2512,22 @@ int drbd_adm_invalidate_peer(struct sk_buff *skb, struct genl_info *info)
wait_event(mdev->misc_wait, !test_bit(BITMAP_IO, &mdev->flags));
drbd_flush_workqueue(mdev);
- retcode = _drbd_request_state(mdev, NS(conn, C_STARTING_SYNC_S), CS_ORDERED);
- if (retcode < SS_SUCCESS) {
- if (mdev->state.conn == C_STANDALONE && mdev->state.role == R_PRIMARY) {
- /* The peer will get a resync upon connect anyways. Just make that
- into a full resync. */
- retcode = drbd_request_state(mdev, NS(pdsk, D_INCONSISTENT));
- if (retcode >= SS_SUCCESS) {
- if (drbd_bitmap_io(mdev, &drbd_bmio_set_susp_al,
- "set_n_write from invalidate_peer",
- BM_LOCKED_SET_ALLOWED))
- retcode = ERR_IO_MD_DISK;
- }
- } else
- retcode = drbd_request_state(mdev, NS(conn, C_STARTING_SYNC_S));
- }
+ /* If we happen to be C_STANDALONE R_PRIMARY, just set all bits
+ * in the bitmap. Otherwise, try to start a resync handshake
+ * as sync source for full sync.
+ */
+ if (mdev->state.conn == C_STANDALONE && mdev->state.role == R_PRIMARY) {
+ /* The peer will get a resync upon connect anyways. Just make that
+ into a full resync. */
+ retcode = drbd_request_state(mdev, NS(pdsk, D_INCONSISTENT));
+ if (retcode >= SS_SUCCESS) {
+ if (drbd_bitmap_io(mdev, &drbd_bmio_set_susp_al,
+ "set_n_write from invalidate_peer",
+ BM_LOCKED_SET_ALLOWED))
+ retcode = ERR_IO_MD_DISK;
+ }
+ } else
+ retcode = drbd_request_state(mdev, NS(conn, C_STARTING_SYNC_S));
drbd_resume_io(mdev);
out:
--
1.7.9.5
next prev parent reply other threads:[~2013-03-27 13:13 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-27 13:08 [PATCH 00/17] RFC: Pile of DRBD fixes Philipp Reisner
2013-03-27 13:08 ` [PATCH 01/17] idr: document exit conditions on idr_for_each_entry better Philipp Reisner
2013-03-27 13:08 ` [PATCH 02/17] drbd: reset ap_in_flight counter for new connections Philipp Reisner
2013-03-27 13:08 ` [PATCH 03/17] drbd: abort start of resync early, if it raced with connection breakage Philipp Reisner
2013-03-27 13:08 ` [PATCH 04/17] drbd: move invalidating the whole bitmap out of after_state ch() Philipp Reisner
2013-03-27 13:08 ` [PATCH 05/17] drbd: fix effective error returned when refusing an invalidate Philipp Reisner
2013-03-27 13:08 ` Philipp Reisner [this message]
2013-03-27 13:08 ` [PATCH 07/17] drbd: fix spurious warning about bitmap being locked from detach Philipp Reisner
2013-03-27 13:08 ` [PATCH 08/17] drbd: Fix disconnect to keep the peer disk state if connection breaks during operation Philipp Reisner
2013-03-27 13:08 ` [PATCH 09/17] drbd: only fail empty flushes if no good data is reachable Philipp Reisner
2013-03-27 13:08 ` [PATCH 10/17] drbd: fix memory leak Philipp Reisner
2013-03-27 13:08 ` [PATCH 11/17] drbd: validate resync_after dependency on attach already Philipp Reisner
2013-03-27 13:08 ` [PATCH 12/17] drbd: Fix build error when CONFIG_CRYPTO_HMAC is not set Philipp Reisner
2013-03-27 13:08 ` [PATCH 13/17] drbd: fix drbd epoch write count for ahead/behind mode Philipp Reisner
2013-03-27 13:08 ` [PATCH 14/17] drbd: add module_put() on error path in drbd_proc_open() Philipp Reisner
2013-03-27 13:08 ` [PATCH 15/17] drbd: fix for deadlock when using automatic split-brain-recovery Philipp Reisner
2013-03-27 13:08 ` [PATCH 16/17] drbd: use sched_setscheduler() Philipp Reisner
2013-03-27 13:08 ` [PATCH 17/17] drbd: fix if(); found by kbuild test robot Philipp Reisner
2013-03-28 16:11 ` [PATCH 00/17] RFC: Pile of DRBD fixes Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1364389729-17559-7-git-send-email-philipp.reisner@linbit.com \
--to=philipp.reisner@linbit.com \
--cc=axboe@kernel.dk \
--cc=drbd-dev@lists.linbit.com \
--cc=lars.ellenberg@linbit.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome