Collect the code that tests for and implements a backoff delay for a ceph connection into a new function, ceph_backoff().
Make the debug output messages in that part of the code report things consistently by reporting a message in the socket closed case, and by making the one for PREOPEN state report the connection pointer like the rest. Signed-off-by: Alex Elder <[email protected]> --- net/ceph/messenger.c | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index ab702cd..686973c 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -2296,6 +2296,24 @@ static bool con_sock_closed(struct ceph_connection *con) return true; } +static bool con_backoff(struct ceph_connection *con) +{ + int ret; + + if (!test_and_clear_bit(CON_FLAG_BACKOFF, &con->flags)) + return false; + + ret = queue_con_delay(con, round_jiffies_relative(con->delay)); + if (ret) { + dout("%s %p FAILED to back off %lu\n", + __func__, con, con->delay); + BUG_ON(ret == -ENOENT); + set_bit(CON_FLAG_BACKOFF, &con->flags); + } + + return true; +} + /* * Do some work on a connection. Drop a connection ref when we're done. */ @@ -2307,21 +2325,14 @@ static void con_work(struct work_struct *work) mutex_lock(&con->mutex); restart: - if (con_sock_closed(con)) + if (con_sock_closed(con)) { + dout("con_work %p SOCK_CLOSED\n", con); goto fault; - - if (test_and_clear_bit(CON_FLAG_BACKOFF, &con->flags)) { - dout("con_work %p backing off\n", con); - ret = queue_con_delay(con, round_jiffies_relative(con->delay)); - if (ret) { - dout("con_work %p FAILED to back off %lu\n", con, - con->delay); - BUG_ON(ret == -ENOENT); - set_bit(CON_FLAG_BACKOFF, &con->flags); - } + } + if (con_backoff(con)) { + dout("con_work %p BACKOFF\n", con); goto done; } - if (con->state == CON_STATE_STANDBY) { dout("con_work %p STANDBY\n", con); goto done; @@ -2332,7 +2343,7 @@ restart: goto done; } if (con->state == CON_STATE_PREOPEN) { - dout("con_work OPENING\n"); + dout("con_work %p OPENING\n", con); BUG_ON(con->sock); } -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
