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

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

ceph: fix connection fault STANDBY check 



Move any out_sent messages to out_queue _before_ checking if
out_queue is empty and going to STANDBY, or else we may drop
something that was never acked.

And clean up the code a bit (less goto).

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

fs/ceph/messenger.c

+13 −18
Original line number Diff line number Diff line
@@ -1853,31 +1853,26 @@ static void ceph_fault(struct ceph_connection *con) 
		con->in_msg = NULL;

	}



	/* Requeue anything that hasn't been acked */

	list_splice_init(&con->out_sent, &con->out_queue);



	/* If there are no messages in the queue, place the connection

	 * in a STANDBY state (i.e., don't try to reconnect just yet). */

	if (list_empty(&con->out_queue) && !con->out_keepalive_pending) {

		dout("fault setting STANDBY\n");

		set_bit(STANDBY, &con->state);

		mutex_unlock(&con->mutex);

		goto out;

	}



	/* Requeue anything that hasn't been acked, and retry after a

	 * delay. */

	list_splice_init(&con->out_sent, &con->out_queue);



	} else {

		/* retry after a delay. */

		if (con->delay == 0)

			con->delay = BASE_DELAY_INTERVAL;

		else if (con->delay < MAX_DELAY_INTERVAL)

			con->delay *= 2;



	/* explicitly schedule work to try to reconnect again later. */

		dout("fault queueing %p delay %lu\n", con, con->delay);

		con->ops->get(con);

		if (queue_delayed_work(ceph_msgr_wq, &con->work,

				       round_jiffies_relative(con->delay)) == 0)

			con->ops->put(con);

	}



out_unlock:

	mutex_unlock(&con->mutex);