From cacc340a8f6f34515800cbc70da6b90cc8296582 Mon Sep 17 00:00:00 2001 From: Adam Gandelman Date: Thu, 8 Apr 2010 16:48:23 -0700 Subject: [PATCH] --- yaml --- r: 196843 b: refs/heads/master c: 3a11a4878939e0e3c355bf3f52ef642a4cb6ba84 h: refs/heads/master i: 196841: fe3193d78707c1c348d87b010c751833740acaf5 196839: 0b41a46a1a92282745721fb1ff1fc64be3fdf57f v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_receiver.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b4c0d5e8ffb5..fefbec3a15e4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 979f5c7f1f6c8a532b943defb790d43b999934eb +refs/heads/master: 3a11a4878939e0e3c355bf3f52ef642a4cb6ba84 diff --git a/trunk/drivers/block/drbd/drbd_receiver.c b/trunk/drivers/block/drbd/drbd_receiver.c index 3a36bc814e77..6876041fc3d8 100644 --- a/trunk/drivers/block/drbd/drbd_receiver.c +++ b/trunk/drivers/block/drbd/drbd_receiver.c @@ -2487,6 +2487,9 @@ static enum drbd_conns drbd_sync_handshake(struct drbd_conf *mdev, enum drbd_rol hg > 0 ? "source" : "target"); } + if (abs(hg) == 100) + drbd_khelper(mdev, "initial-split-brain"); + if (hg == 100 || (hg == -100 && mdev->net_conf->always_asbp)) { int pcount = (mdev->state.role == R_PRIMARY) + (peer_role == R_PRIMARY); @@ -2532,7 +2535,7 @@ static enum drbd_conns drbd_sync_handshake(struct drbd_conf *mdev, enum drbd_rol * after an attempted attach on a diskless node. * We just refuse to attach -- well, we drop the "connection" * to that disk, in a way... */ - dev_alert(DEV, "Split-Brain detected, dropping connection!\n"); + dev_alert(DEV, "Split-Brain detected but unresolved, dropping connection!\n"); drbd_khelper(mdev, "split-brain"); return C_MASK; }