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

Commit e2663ab6 authored by Sage Weil's avatar Sage Weil
Browse files

ceph: allow connection to be reopened by fault callback 



Fix the messenger to allow a ceph_con_open() during the fault callback.
Previously the work wasn't getting queued on the connection because the
fault path avoids requeued work (normally spurious).  Loop on reopening by
checking for the OPENING state bit.

This fixes OSD reconnects when a TCP connection drops.

Signed-off-by: default avatarSage Weil <sage@newdream.net>
parent 153a008b

fs/ceph/messenger.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1808,7 +1808,7 @@ static void con_work(struct work_struct *work) 
	clear_bit(BUSY, &con->state);

	clear_bit(BUSY, &con->state);

	dout("con->state=%lu\n", con->state);

	dout("con->state=%lu\n", con->state);

	if (test_bit(QUEUED, &con->state)) {

	if (test_bit(QUEUED, &con->state)) {

		if (!backoff) {

		if (!backoff || test_bit(OPENING, &con->state)) {

			dout("con_work %p QUEUED reset, looping\n", con);

			dout("con_work %p QUEUED reset, looping\n", con);

			goto more;

			goto more;

		}

		}