提交 87f7be4c 编写于 作者: P Philipp Reisner

drbd: Run the fence-peer helper asynchronously

Since we can not thaw the transfer log, the next logical step is
to allow reconnects while the fence-peer handler runs.
Signed-off-by: NPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: NLars Ellenberg <lars.ellenberg@linbit.com>
上级 1616a254
...@@ -1423,7 +1423,8 @@ extern void resync_after_online_grow(struct drbd_conf *); ...@@ -1423,7 +1423,8 @@ extern void resync_after_online_grow(struct drbd_conf *);
extern void drbd_setup_queue_param(struct drbd_conf *mdev, unsigned int) __must_hold(local); extern void drbd_setup_queue_param(struct drbd_conf *mdev, unsigned int) __must_hold(local);
extern int drbd_set_role(struct drbd_conf *mdev, enum drbd_role new_role, extern int drbd_set_role(struct drbd_conf *mdev, enum drbd_role new_role,
int force); int force);
enum drbd_disk_state drbd_try_outdate_peer(struct drbd_conf *mdev); extern enum drbd_disk_state drbd_try_outdate_peer(struct drbd_conf *mdev);
extern void drbd_try_outdate_peer_async(struct drbd_conf *mdev);
extern int drbd_khelper(struct drbd_conf *mdev, char *cmd); extern int drbd_khelper(struct drbd_conf *mdev, char *cmd);
/* drbd_worker.c */ /* drbd_worker.c */
......
...@@ -38,6 +38,8 @@ ...@@ -38,6 +38,8 @@
#include <asm/unaligned.h> #include <asm/unaligned.h>
#include <linux/drbd_tag_magic.h> #include <linux/drbd_tag_magic.h>
#include <linux/drbd_limits.h> #include <linux/drbd_limits.h>
#include <linux/compiler.h>
#include <linux/kthread.h>
static unsigned short *tl_add_blob(unsigned short *, enum drbd_tags, const void *, int); static unsigned short *tl_add_blob(unsigned short *, enum drbd_tags, const void *, int);
static unsigned short *tl_add_str(unsigned short *, enum drbd_tags, const char *); static unsigned short *tl_add_str(unsigned short *, enum drbd_tags, const char *);
...@@ -256,6 +258,25 @@ enum drbd_disk_state drbd_try_outdate_peer(struct drbd_conf *mdev) ...@@ -256,6 +258,25 @@ enum drbd_disk_state drbd_try_outdate_peer(struct drbd_conf *mdev)
return nps; return nps;
} }
static int _try_outdate_peer_async(void *data)
{
struct drbd_conf *mdev = (struct drbd_conf *)data;
enum drbd_disk_state nps;
nps = drbd_try_outdate_peer(mdev);
drbd_request_state(mdev, NS(pdsk, nps));
return 0;
}
void drbd_try_outdate_peer_async(struct drbd_conf *mdev)
{
struct task_struct *opa;
opa = kthread_run(_try_outdate_peer_async, mdev, "drbd%d_a_helper", mdev_to_minor(mdev));
if (IS_ERR(opa))
dev_err(DEV, "out of mem, failed to invoke fence-peer helper\n");
}
int drbd_set_role(struct drbd_conf *mdev, enum drbd_role new_role, int force) int drbd_set_role(struct drbd_conf *mdev, enum drbd_role new_role, int force)
{ {
......
...@@ -3747,12 +3747,8 @@ static void drbd_disconnect(struct drbd_conf *mdev) ...@@ -3747,12 +3747,8 @@ static void drbd_disconnect(struct drbd_conf *mdev)
put_ldev(mdev); put_ldev(mdev);
} }
if (mdev->state.role == R_PRIMARY) { if (mdev->state.role == R_PRIMARY && fp >= FP_RESOURCE && mdev->state.pdsk >= D_UNKNOWN)
if (fp >= FP_RESOURCE && mdev->state.pdsk >= D_UNKNOWN) { drbd_try_outdate_peer_async(mdev);
enum drbd_disk_state nps = drbd_try_outdate_peer(mdev);
drbd_request_state(mdev, NS(pdsk, nps));
}
}
spin_lock_irq(&mdev->req_lock); spin_lock_irq(&mdev->req_lock);
os = mdev->state; os = mdev->state;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册