| Message ID | 1403255383-5729-2-git-send-email-ilya.dryomov@inktank.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Reviewed-by: On Fri, 20 Jun 2014, Ilya Dryomov wrote: > It is important that both regular and lingering requests lists are > empty when the OSD is removed. > > Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com> > --- > net/ceph/osd_client.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c > index b0dfce77656a..6b8c5e8c49ce 100644 > --- a/net/ceph/osd_client.c > +++ b/net/ceph/osd_client.c > @@ -1007,7 +1007,8 @@ static void put_osd(struct ceph_osd *osd) > static void __remove_osd(struct ceph_osd_client *osdc, struct ceph_osd *osd) > { > dout("__remove_osd %p\n", osd); > - BUG_ON(!list_empty(&osd->o_requests)); > + BUG_ON(!list_empty(&osd->o_requests) || > + !list_empty(&osd->o_linger_requests)); > rb_erase(&osd->o_node, &osdc->osds); > list_del_init(&osd->o_osd_lru); > ceph_con_close(&osd->o_con); > -- > 1.7.10.4 > > -- > To unsubscribe from this list: send the line "unsubscribe ceph-devel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > > -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index b0dfce77656a..6b8c5e8c49ce 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -1007,7 +1007,8 @@ static void put_osd(struct ceph_osd *osd) static void __remove_osd(struct ceph_osd_client *osdc, struct ceph_osd *osd) { dout("__remove_osd %p\n", osd); - BUG_ON(!list_empty(&osd->o_requests)); + BUG_ON(!list_empty(&osd->o_requests) || + !list_empty(&osd->o_linger_requests)); rb_erase(&osd->o_node, &osdc->osds); list_del_init(&osd->o_osd_lru); ceph_con_close(&osd->o_con);
It is important that both regular and lingering requests lists are empty when the OSD is removed. Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com> --- net/ceph/osd_client.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)