Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 481c6f50 authored by Philipp Reisner's avatar Philipp Reisner
Browse files

drbd: Ensure that the peer was not rebootet in the meantime before resending TL 



Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
parent 43a5182c

drivers/block/drbd/drbd_nl.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -208,9 +208,6 @@ enum drbd_disk_state drbd_try_outdate_peer(struct drbd_conf *mdev) 
		return mdev->state.pdsk;

		return mdev->state.pdsk;

	}

	}





	if (fp == FP_STONITH)

		_drbd_request_state(mdev, NS(susp, 1), CS_WAIT_COMPLETE);



	r = drbd_khelper(mdev, "fence-peer");

	r = drbd_khelper(mdev, "fence-peer");





	switch ((r>>8) & 0xff) {

	switch ((r>>8) & 0xff) {

drivers/block/drbd/drbd_receiver.c

+12 −1
Original line number Original line Diff line number Diff line
@@ -3265,7 +3265,18 @@ static int receive_state(struct drbd_conf *mdev, struct p_header *h) 
	ns.peer_isp = (peer_state.aftr_isp | peer_state.user_isp);

	ns.peer_isp = (peer_state.aftr_isp | peer_state.user_isp);

	if ((nconn == C_CONNECTED || nconn == C_WF_BITMAP_S) && ns.disk == D_NEGOTIATING)

	if ((nconn == C_CONNECTED || nconn == C_WF_BITMAP_S) && ns.disk == D_NEGOTIATING)

		ns.disk = mdev->new_state_tmp.disk;

		ns.disk = mdev->new_state_tmp.disk;



	if (ns.pdsk == D_CONSISTENT && ns.susp && nconn == C_CONNECTED && oconn < C_CONNECTED &&

	    test_bit(NEW_CUR_UUID, &mdev->flags)) {

		/* Do not allow tl_restart(resend) for a rebooted peer. We can only allow this

		   for temporal network outages! */

		spin_unlock_irq(&mdev->req_lock);

		dev_err(DEV, "Aborting Connect, can not thaw IO with an only Consistent peer\n");

		tl_clear(mdev);

		drbd_uuid_new_current(mdev);

		clear_bit(NEW_CUR_UUID, &mdev->flags);

		drbd_force_state(mdev, NS2(conn, C_PROTOCOL_ERROR, susp, 0));

		return FALSE;

	}

	rv = _drbd_set_state(mdev, ns, CS_VERBOSE | CS_HARD, NULL);

	rv = _drbd_set_state(mdev, ns, CS_VERBOSE | CS_HARD, NULL);

	ns = mdev->state;

	ns = mdev->state;

	spin_unlock_irq(&mdev->req_lock);

	spin_unlock_irq(&mdev->req_lock);

drivers/block/drbd/drbd_req.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -662,7 +662,7 @@ int __req_mod(struct drbd_request *req, enum drbd_req_event what, 
		/* If RQ_NET_OK is already set, we got a P_WRITE_ACK or P_RECV_ACK

		/* If RQ_NET_OK is already set, we got a P_WRITE_ACK or P_RECV_ACK

		   before the connection loss (B&C only); only P_BARRIER_ACK was missing.

		   before the connection loss (B&C only); only P_BARRIER_ACK was missing.

		   Trowing them out of the TL here by pretending we got a BARRIER_ACK

		   Trowing them out of the TL here by pretending we got a BARRIER_ACK

		   TODO: Either resync them, or ensure peer was not rebooted. */

		   We ensure that the peer was not rebooted */

		if (!(req->rq_state & RQ_NET_OK)) {

		if (!(req->rq_state & RQ_NET_OK)) {

			if (req->w.cb) {

			if (req->w.cb) {

				drbd_queue_work(&mdev->data.work, &req->w);

				drbd_queue_work(&mdev->data.work, &req->w);