diff options
author | Philipp Reisner <philipp.reisner@linbit.com> | 2012-08-28 10:48:03 -0400 |
---|---|---|
committer | Philipp Reisner <philipp.reisner@linbit.com> | 2012-11-09 08:11:08 -0500 |
commit | 19fffd7b0303e8843aa2decfd43fa57c9d511409 (patch) | |
tree | 19ac111fafeec46eac2b0e8cee4f41f4327a1129 /drivers/block/drbd/drbd_main.c | |
parent | d76440181d0e05826f228189b74b4dbf64b68981 (diff) |
drbd: Call drbd_md_sync() explicitly after a state change on the connection
Without this, the meta-data gets updates after 5 seconds by the
md_sync_timer. Better to do it immeditaly after a state change.
If the asender detects a network failure, it may take a bit until
the worker processes the according after-conn-state-change work item.
The worker might be blocked in sending something, i.e. it
takes until it gets into its timeout. That is 6 seconds by
default which is longer than the 5 seconds of the md_sync_timer.
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_main.c')
-rw-r--r-- | drivers/block/drbd/drbd_main.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index 732053de1db..5e5a6abb281 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c | |||
@@ -2820,6 +2820,22 @@ void drbd_free_sock(struct drbd_tconn *tconn) | |||
2820 | 2820 | ||
2821 | /* meta data management */ | 2821 | /* meta data management */ |
2822 | 2822 | ||
2823 | void conn_md_sync(struct drbd_tconn *tconn) | ||
2824 | { | ||
2825 | struct drbd_conf *mdev; | ||
2826 | int vnr; | ||
2827 | |||
2828 | rcu_read_lock(); | ||
2829 | idr_for_each_entry(&tconn->volumes, mdev, vnr) { | ||
2830 | kref_get(&mdev->kref); | ||
2831 | rcu_read_unlock(); | ||
2832 | drbd_md_sync(mdev); | ||
2833 | kref_put(&mdev->kref, &drbd_minor_destroy); | ||
2834 | rcu_read_lock(); | ||
2835 | } | ||
2836 | rcu_read_unlock(); | ||
2837 | } | ||
2838 | |||
2823 | struct meta_data_on_disk { | 2839 | struct meta_data_on_disk { |
2824 | u64 la_size; /* last agreed size. */ | 2840 | u64 la_size; /* last agreed size. */ |
2825 | u64 uuid[UI_SIZE]; /* UUIDs. */ | 2841 | u64 uuid[UI_SIZE]; /* UUIDs. */ |