Hi Sage, Thanks a lot for your reply!
>>> On 6/29/2012 at 12:24 PM, in message <[email protected]>, Sage Weil <[email protected]> wrote: > I take it back; this is pretty straightforward :) > > On Thu, 21 Jun 2012, Guanjun He wrote: > >> Add an atomic variable 'teardowning' as flag in struct ceph_messenger, >> set this flag to 1 in function ceph_destroy_client(), and add the condition > code >> in function ceph_data_ready() to test the flag value, if true(1), just > return. >> >> Signed-off-by: Guanjun He <[email protected]> >> --- >> include/linux/ceph/messenger.h | 1 + >> net/ceph/ceph_common.c | 5 +++-- >> net/ceph/messenger.c | 5 +++++ >> 3 files changed, 9 insertions(+), 2 deletions(-) >> >> diff --git a/include/linux/ceph/messenger.h b/include/linux/ceph/messenger.h >> index 2521a95..70ff3b7 100644 >> --- a/include/linux/ceph/messenger.h >> +++ b/include/linux/ceph/messenger.h >> @@ -54,6 +54,7 @@ struct ceph_messenger { >> struct ceph_entity_addr my_enc_addr; >> >> bool nocrc; >> + atomic_t teardowning; > > Can we call this 'stopping'? Of course we can. > >> >> /* >> * the global_seq counts connections i (attempt to) initiate >> diff --git a/net/ceph/ceph_common.c b/net/ceph/ceph_common.c >> index a776f75..7225e42 100644 >> --- a/net/ceph/ceph_common.c >> +++ b/net/ceph/ceph_common.c >> @@ -501,6 +501,9 @@ void ceph_destroy_client(struct ceph_client *client) >> { >> dout("destroy_client %p\n", client); >> >> + atomic_set(&client->msgr->teardowning, 1); >> + ceph_msgr_flush(); >> + > > There is another patch in the master or testing branch of ceph-client.git > htat moves the ceph_msgr_flush() around; can you make sure this patch is > rebased against that? In particular, it should add the atomic set and > checks, but not move the flush calls around (which is unrelated). Just checked, this patch is not rebased against the latest branch. > > Otherwise, this looks good to me! Please resend with those changes and > we'll stick it in the tree. I will re-produce the patch against the latest branch, and make a simply test and re-send the new patch hours later. best, Guanjun > > Thanks! > sage > > > >> /* unmount */ >> ceph_osdc_stop(&client->osdc); >> >> @@ -509,8 +512,6 @@ void ceph_destroy_client(struct ceph_client *client) >> * auth module, which is needed to free those connections' >> * ceph_authorizers. >> */ >> - ceph_msgr_flush(); >> - >> ceph_monc_stop(&client->monc); >> >> ceph_debugfs_client_cleanup(client); >> diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c >> index 524f4e4..89a96e7 100644 >> --- a/net/ceph/messenger.c >> +++ b/net/ceph/messenger.c >> @@ -156,6 +156,9 @@ EXPORT_SYMBOL(ceph_msgr_flush); >> static void ceph_data_ready(struct sock *sk, int count_unused) >> { >> struct ceph_connection *con = sk->sk_user_data; >> + if (atomic_read(&con->msgr->teardowning)) { >> + return; >> + } >> >> if (sk->sk_state != TCP_CLOSE_WAIT) { >> dout("ceph_data_ready on %p state = %lu, queueing work\n", >> @@ -2281,6 +2284,8 @@ struct ceph_messenger *ceph_messenger_create(struct > ceph_entity_addr *myaddr, >> get_random_bytes(&msgr->inst.addr.nonce, sizeof(msgr->inst.addr.nonce)); >> encode_my_addr(msgr); >> >> + atomic_set(&msgr->teardowning, 0); >> + >> dout("messenger_create %p\n", msgr); >> return msgr; >> } >> -- >> 1.7.3.4 >> >> -- 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
