diff mbox

rbd: fix I/O error propagation for reads

Message ID 1377567242-25736-1-git-send-email-josh.durgin@inktank.com (mailing list archive)
State New, archived
Headers show

Commit Message

Josh Durgin Aug. 27, 2013, 1:34 a.m. UTC
When a request returns an error, the driver needs to report the entire
extent of the request as completed.  Writes already did this, since
they always set xferred = length, but reads were skipping that step if
an error other than -ENOENT occurred.  Instead, rbd would end up
passing 0 xferred to blk_end_request(), which would always report
needing more data.  This resulted in an assert failing when more data
was required by the block layer, but all the object requests were
done:

[ 1868.719077] rbd: obj_request read result -108 xferred 0
[ 1868.719077]
[ 1868.719518] end_request: I/O error, dev rbd1, sector 0
[ 1868.719739]
[ 1868.719739] Assertion failure in rbd_img_obj_callback() at line 1736:
[ 1868.719739]
[ 1868.719739]   rbd_assert(more ^ (which == img_request->obj_request_count));

Without this assert, reads that hit errors would hang forever, since
the block layer considered them incomplete.

Fixes: http://tracker.ceph.com/issues/5647
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
---
 drivers/block/rbd.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

Comments

Mike Dawson Aug. 27, 2013, 3:27 a.m. UTC | #1
Josh,

The original bug is marked as krbd, but could this bug could affect rbd 
volumes mounted via qemu as well? If so, could you describe how it might 
block a qemu guest?

We've been fighting i/o issues on some of our guests for some time. With 
qemu 1.4.0, we saw the entire guest freeze. But now with qemu 1.5.2 
which includes your asynchronous flush patch, the issue is typified by 
periodic dips in performance and high latency (especially for reads, it 
seems). Could this bug be related?

Thanks,
Mike Dawson


On 8/26/2013 9:34 PM, Josh Durgin wrote:
> When a request returns an error, the driver needs to report the entire
> extent of the request as completed.  Writes already did this, since
> they always set xferred = length, but reads were skipping that step if
> an error other than -ENOENT occurred.  Instead, rbd would end up
> passing 0 xferred to blk_end_request(), which would always report
> needing more data.  This resulted in an assert failing when more data
> was required by the block layer, but all the object requests were
> done:
>
> [ 1868.719077] rbd: obj_request read result -108 xferred 0
> [ 1868.719077]
> [ 1868.719518] end_request: I/O error, dev rbd1, sector 0
> [ 1868.719739]
> [ 1868.719739] Assertion failure in rbd_img_obj_callback() at line 1736:
> [ 1868.719739]
> [ 1868.719739]   rbd_assert(more ^ (which == img_request->obj_request_count));
>
> Without this assert, reads that hit errors would hang forever, since
> the block layer considered them incomplete.
>
> Fixes: http://tracker.ceph.com/issues/5647
> Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
> ---
>   drivers/block/rbd.c |   14 +++++++-------
>   1 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
> index 0d669ae..f8fd7d3 100644
> --- a/drivers/block/rbd.c
> +++ b/drivers/block/rbd.c
> @@ -1557,11 +1557,12 @@ rbd_img_obj_request_read_callback(struct rbd_obj_request *obj_request)
>   		obj_request, obj_request->img_request, obj_request->result,
>   		xferred, length);
>   	/*
> -	 * ENOENT means a hole in the image.  We zero-fill the
> -	 * entire length of the request.  A short read also implies
> -	 * zero-fill to the end of the request.  Either way we
> -	 * update the xferred count to indicate the whole request
> -	 * was satisfied.
> +	 * ENOENT means a hole in the image.  We zero-fill the entire
> +	 * length of the request.  A short read also implies zero-fill
> +	 * to the end of the request.  An error requires the whole
> +	 * length of the request to be reported finished with an error
> +	 * to the block layer.  In each case we update the xferred
> +	 * count to indicate the whole request was satisfied.
>   	 */
>   	rbd_assert(obj_request->type != OBJ_REQUEST_NODATA);
>   	if (obj_request->result == -ENOENT) {
> @@ -1570,14 +1571,13 @@ rbd_img_obj_request_read_callback(struct rbd_obj_request *obj_request)
>   		else
>   			zero_pages(obj_request->pages, 0, length);
>   		obj_request->result = 0;
> -		obj_request->xferred = length;
>   	} else if (xferred < length && !obj_request->result) {
>   		if (obj_request->type == OBJ_REQUEST_BIO)
>   			zero_bio_chain(obj_request->bio_list, xferred);
>   		else
>   			zero_pages(obj_request->pages, xferred, length);
> -		obj_request->xferred = length;
>   	}
> +	obj_request->xferred = length;
>   	obj_request_done_set(obj_request);
>   }
>
>
--
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
Josh Durgin Aug. 27, 2013, 7:19 a.m. UTC | #2
On 08/26/2013 08:27 PM, Mike Dawson wrote:
> Josh,
>
> The original bug is marked as krbd, but could this bug could affect rbd
> volumes mounted via qemu as well? If so, could you describe how it might
> block a qemu guest?

No, this is just a patch for the kernel rbd driver, which doesn't
affect qemu at all.

> We've been fighting i/o issues on some of our guests for some time. With
> qemu 1.4.0, we saw the entire guest freeze. But now with qemu 1.5.2
> which includes your asynchronous flush patch, the issue is typified by
> periodic dips in performance and high latency (especially for reads, it
> seems). Could this bug be related?

A good next step for tracking this down would be narrowing in on the
source of the periods of high latency - starting with whether they're
primarily coming from the server or client side. Since it's especially
reads, I'd guess it's more likely to be an osd-side issue. If you look
at the admin socket's dump_historic_ops do you see higher op durations
around the dips in performance? What about any correlation with
underlying disk stats from iostat -x?

> Thanks,
> Mike Dawson
>
>
> On 8/26/2013 9:34 PM, Josh Durgin wrote:
>> When a request returns an error, the driver needs to report the entire
>> extent of the request as completed.  Writes already did this, since
>> they always set xferred = length, but reads were skipping that step if
>> an error other than -ENOENT occurred.  Instead, rbd would end up
>> passing 0 xferred to blk_end_request(), which would always report
>> needing more data.  This resulted in an assert failing when more data
>> was required by the block layer, but all the object requests were
>> done:
>>
>> [ 1868.719077] rbd: obj_request read result -108 xferred 0
>> [ 1868.719077]
>> [ 1868.719518] end_request: I/O error, dev rbd1, sector 0
>> [ 1868.719739]
>> [ 1868.719739] Assertion failure in rbd_img_obj_callback() at line 1736:
>> [ 1868.719739]
>> [ 1868.719739]   rbd_assert(more ^ (which ==
>> img_request->obj_request_count));
>>
>> Without this assert, reads that hit errors would hang forever, since
>> the block layer considered them incomplete.
>>
>> Fixes: http://tracker.ceph.com/issues/5647
>> Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
>> ---
>>   drivers/block/rbd.c |   14 +++++++-------
>>   1 files changed, 7 insertions(+), 7 deletions(-)
>>
>> diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
>> index 0d669ae..f8fd7d3 100644
>> --- a/drivers/block/rbd.c
>> +++ b/drivers/block/rbd.c
>> @@ -1557,11 +1557,12 @@ rbd_img_obj_request_read_callback(struct
>> rbd_obj_request *obj_request)
>>           obj_request, obj_request->img_request, obj_request->result,
>>           xferred, length);
>>       /*
>> -     * ENOENT means a hole in the image.  We zero-fill the
>> -     * entire length of the request.  A short read also implies
>> -     * zero-fill to the end of the request.  Either way we
>> -     * update the xferred count to indicate the whole request
>> -     * was satisfied.
>> +     * ENOENT means a hole in the image.  We zero-fill the entire
>> +     * length of the request.  A short read also implies zero-fill
>> +     * to the end of the request.  An error requires the whole
>> +     * length of the request to be reported finished with an error
>> +     * to the block layer.  In each case we update the xferred
>> +     * count to indicate the whole request was satisfied.
>>        */
>>       rbd_assert(obj_request->type != OBJ_REQUEST_NODATA);
>>       if (obj_request->result == -ENOENT) {
>> @@ -1570,14 +1571,13 @@ rbd_img_obj_request_read_callback(struct
>> rbd_obj_request *obj_request)
>>           else
>>               zero_pages(obj_request->pages, 0, length);
>>           obj_request->result = 0;
>> -        obj_request->xferred = length;
>>       } else if (xferred < length && !obj_request->result) {
>>           if (obj_request->type == OBJ_REQUEST_BIO)
>>               zero_bio_chain(obj_request->bio_list, xferred);
>>           else
>>               zero_pages(obj_request->pages, xferred, length);
>> -        obj_request->xferred = length;
>>       }
>> +    obj_request->xferred = length;
>>       obj_request_done_set(obj_request);
>>   }
>>
>>

--
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
Alex Elder Aug. 27, 2013, 12:29 p.m. UTC | #3
On 08/26/2013 08:34 PM, Josh Durgin wrote:
> When a request returns an error, the driver needs to report the entire
> extent of the request as completed.  Writes already did this, since

You're right.  The block layer needs to "consume" the bytes in this
portion of the image request whether or not they were completed
successfully.

This looks good to me.

Reviewed-by: Alex Elder <elder@linaro.org>

> they always set xferred = length, but reads were skipping that step if
> an error other than -ENOENT occurred.  Instead, rbd would end up
> passing 0 xferred to blk_end_request(), which would always report
> needing more data.  This resulted in an assert failing when more data
> was required by the block layer, but all the object requests were
> done:
> 
> [ 1868.719077] rbd: obj_request read result -108 xferred 0
> [ 1868.719077]
> [ 1868.719518] end_request: I/O error, dev rbd1, sector 0
> [ 1868.719739]
> [ 1868.719739] Assertion failure in rbd_img_obj_callback() at line 1736:
> [ 1868.719739]
> [ 1868.719739]   rbd_assert(more ^ (which == img_request->obj_request_count));
> 
> Without this assert, reads that hit errors would hang forever, since
> the block layer considered them incomplete.
> 
> Fixes: http://tracker.ceph.com/issues/5647
> Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
> ---
>  drivers/block/rbd.c |   14 +++++++-------
>  1 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
> index 0d669ae..f8fd7d3 100644
> --- a/drivers/block/rbd.c
> +++ b/drivers/block/rbd.c
> @@ -1557,11 +1557,12 @@ rbd_img_obj_request_read_callback(struct rbd_obj_request *obj_request)
>  		obj_request, obj_request->img_request, obj_request->result,
>  		xferred, length);
>  	/*
> -	 * ENOENT means a hole in the image.  We zero-fill the
> -	 * entire length of the request.  A short read also implies
> -	 * zero-fill to the end of the request.  Either way we
> -	 * update the xferred count to indicate the whole request
> -	 * was satisfied.
> +	 * ENOENT means a hole in the image.  We zero-fill the entire
> +	 * length of the request.  A short read also implies zero-fill
> +	 * to the end of the request.  An error requires the whole
> +	 * length of the request to be reported finished with an error
> +	 * to the block layer.  In each case we update the xferred
> +	 * count to indicate the whole request was satisfied.
>  	 */
>  	rbd_assert(obj_request->type != OBJ_REQUEST_NODATA);
>  	if (obj_request->result == -ENOENT) {
> @@ -1570,14 +1571,13 @@ rbd_img_obj_request_read_callback(struct rbd_obj_request *obj_request)
>  		else
>  			zero_pages(obj_request->pages, 0, length);
>  		obj_request->result = 0;
> -		obj_request->xferred = length;
>  	} else if (xferred < length && !obj_request->result) {
>  		if (obj_request->type == OBJ_REQUEST_BIO)
>  			zero_bio_chain(obj_request->bio_list, xferred);
>  		else
>  			zero_pages(obj_request->pages, xferred, length);
> -		obj_request->xferred = length;
>  	}
> +	obj_request->xferred = length;
>  	obj_request_done_set(obj_request);
>  }
>  
> 

--
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
Sage Weil Aug. 27, 2013, 3:36 p.m. UTC | #4
On Tue, 27 Aug 2013, Alex Elder wrote:
> On 08/26/2013 08:34 PM, Josh Durgin wrote:
> > When a request returns an error, the driver needs to report the entire
> > extent of the request as completed.  Writes already did this, since
> 
> You're right.  The block layer needs to "consume" the bytes in this
> portion of the image request whether or not they were completed
> successfully.
> 
> This looks good to me.
> 
> Reviewed-by: Alex Elder <elder@linaro.org>

This one should go to Linus for 3.11.  I added this tot he testing branch 
and put a CC stable for 3.10 in there.. is that the right set of kernels 
to backport to?

Thanks!
sage

 > 
> > they always set xferred = length, but reads were skipping that step if
> > an error other than -ENOENT occurred.  Instead, rbd would end up
> > passing 0 xferred to blk_end_request(), which would always report
> > needing more data.  This resulted in an assert failing when more data
> > was required by the block layer, but all the object requests were
> > done:
> > 
> > [ 1868.719077] rbd: obj_request read result -108 xferred 0
> > [ 1868.719077]
> > [ 1868.719518] end_request: I/O error, dev rbd1, sector 0
> > [ 1868.719739]
> > [ 1868.719739] Assertion failure in rbd_img_obj_callback() at line 1736:
> > [ 1868.719739]
> > [ 1868.719739]   rbd_assert(more ^ (which == img_request->obj_request_count));
> > 
> > Without this assert, reads that hit errors would hang forever, since
> > the block layer considered them incomplete.
> > 
> > Fixes: http://tracker.ceph.com/issues/5647
> > Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
> > ---
> >  drivers/block/rbd.c |   14 +++++++-------
> >  1 files changed, 7 insertions(+), 7 deletions(-)
> > 
> > diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
> > index 0d669ae..f8fd7d3 100644
> > --- a/drivers/block/rbd.c
> > +++ b/drivers/block/rbd.c
> > @@ -1557,11 +1557,12 @@ rbd_img_obj_request_read_callback(struct rbd_obj_request *obj_request)
> >  		obj_request, obj_request->img_request, obj_request->result,
> >  		xferred, length);
> >  	/*
> > -	 * ENOENT means a hole in the image.  We zero-fill the
> > -	 * entire length of the request.  A short read also implies
> > -	 * zero-fill to the end of the request.  Either way we
> > -	 * update the xferred count to indicate the whole request
> > -	 * was satisfied.
> > +	 * ENOENT means a hole in the image.  We zero-fill the entire
> > +	 * length of the request.  A short read also implies zero-fill
> > +	 * to the end of the request.  An error requires the whole
> > +	 * length of the request to be reported finished with an error
> > +	 * to the block layer.  In each case we update the xferred
> > +	 * count to indicate the whole request was satisfied.
> >  	 */
> >  	rbd_assert(obj_request->type != OBJ_REQUEST_NODATA);
> >  	if (obj_request->result == -ENOENT) {
> > @@ -1570,14 +1571,13 @@ rbd_img_obj_request_read_callback(struct rbd_obj_request *obj_request)
> >  		else
> >  			zero_pages(obj_request->pages, 0, length);
> >  		obj_request->result = 0;
> > -		obj_request->xferred = length;
> >  	} else if (xferred < length && !obj_request->result) {
> >  		if (obj_request->type == OBJ_REQUEST_BIO)
> >  			zero_bio_chain(obj_request->bio_list, xferred);
> >  		else
> >  			zero_pages(obj_request->pages, xferred, length);
> > -		obj_request->xferred = length;
> >  	}
> > +	obj_request->xferred = length;
> >  	obj_request_done_set(obj_request);
> >  }
> >  
> > 
> 
> --
> 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
Alex Elder Aug. 27, 2013, 3:40 p.m. UTC | #5
On 08/27/2013 10:36 AM, Sage Weil wrote:
> On Tue, 27 Aug 2013, Alex Elder wrote:
>> On 08/26/2013 08:34 PM, Josh Durgin wrote:
>>> When a request returns an error, the driver needs to report the entire
>>> extent of the request as completed.  Writes already did this, since
>>
>> You're right.  The block layer needs to "consume" the bytes in this
>> portion of the image request whether or not they were completed
>> successfully.
>>
>> This looks good to me.
>>
>> Reviewed-by: Alex Elder <elder@linaro.org>
> 
> This one should go to Linus for 3.11.  I added this tot he testing branch 
> and put a CC stable for 3.10 in there.. is that the right set of kernels 
> to backport to?

3.10 yes.  3.9 is EOL.  3.4.59 (longterm) did not include this code,
so yes, that's the right set of kernels.  (I did not check on anything
Ubuntu is supporting.)

					-Alex

> Thanks!
> sage
> 
>  > 
>>> they always set xferred = length, but reads were skipping that step if
>>> an error other than -ENOENT occurred.  Instead, rbd would end up
>>> passing 0 xferred to blk_end_request(), which would always report
>>> needing more data.  This resulted in an assert failing when more data
>>> was required by the block layer, but all the object requests were
>>> done:
>>>
>>> [ 1868.719077] rbd: obj_request read result -108 xferred 0
>>> [ 1868.719077]
>>> [ 1868.719518] end_request: I/O error, dev rbd1, sector 0
>>> [ 1868.719739]
>>> [ 1868.719739] Assertion failure in rbd_img_obj_callback() at line 1736:
>>> [ 1868.719739]
>>> [ 1868.719739]   rbd_assert(more ^ (which == img_request->obj_request_count));
>>>
>>> Without this assert, reads that hit errors would hang forever, since
>>> the block layer considered them incomplete.
>>>
>>> Fixes: http://tracker.ceph.com/issues/5647
>>> Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
>>> ---
>>>  drivers/block/rbd.c |   14 +++++++-------
>>>  1 files changed, 7 insertions(+), 7 deletions(-)
>>>
>>> diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
>>> index 0d669ae..f8fd7d3 100644
>>> --- a/drivers/block/rbd.c
>>> +++ b/drivers/block/rbd.c
>>> @@ -1557,11 +1557,12 @@ rbd_img_obj_request_read_callback(struct rbd_obj_request *obj_request)
>>>  		obj_request, obj_request->img_request, obj_request->result,
>>>  		xferred, length);
>>>  	/*
>>> -	 * ENOENT means a hole in the image.  We zero-fill the
>>> -	 * entire length of the request.  A short read also implies
>>> -	 * zero-fill to the end of the request.  Either way we
>>> -	 * update the xferred count to indicate the whole request
>>> -	 * was satisfied.
>>> +	 * ENOENT means a hole in the image.  We zero-fill the entire
>>> +	 * length of the request.  A short read also implies zero-fill
>>> +	 * to the end of the request.  An error requires the whole
>>> +	 * length of the request to be reported finished with an error
>>> +	 * to the block layer.  In each case we update the xferred
>>> +	 * count to indicate the whole request was satisfied.
>>>  	 */
>>>  	rbd_assert(obj_request->type != OBJ_REQUEST_NODATA);
>>>  	if (obj_request->result == -ENOENT) {
>>> @@ -1570,14 +1571,13 @@ rbd_img_obj_request_read_callback(struct rbd_obj_request *obj_request)
>>>  		else
>>>  			zero_pages(obj_request->pages, 0, length);
>>>  		obj_request->result = 0;
>>> -		obj_request->xferred = length;
>>>  	} else if (xferred < length && !obj_request->result) {
>>>  		if (obj_request->type == OBJ_REQUEST_BIO)
>>>  			zero_bio_chain(obj_request->bio_list, xferred);
>>>  		else
>>>  			zero_pages(obj_request->pages, xferred, length);
>>> -		obj_request->xferred = length;
>>>  	}
>>> +	obj_request->xferred = length;
>>>  	obj_request_done_set(obj_request);
>>>  }
>>>  
>>>
>>
>> --
>> 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 mbox

Patch

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 0d669ae..f8fd7d3 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -1557,11 +1557,12 @@  rbd_img_obj_request_read_callback(struct rbd_obj_request *obj_request)
 		obj_request, obj_request->img_request, obj_request->result,
 		xferred, length);
 	/*
-	 * ENOENT means a hole in the image.  We zero-fill the
-	 * entire length of the request.  A short read also implies
-	 * zero-fill to the end of the request.  Either way we
-	 * update the xferred count to indicate the whole request
-	 * was satisfied.
+	 * ENOENT means a hole in the image.  We zero-fill the entire
+	 * length of the request.  A short read also implies zero-fill
+	 * to the end of the request.  An error requires the whole
+	 * length of the request to be reported finished with an error
+	 * to the block layer.  In each case we update the xferred
+	 * count to indicate the whole request was satisfied.
 	 */
 	rbd_assert(obj_request->type != OBJ_REQUEST_NODATA);
 	if (obj_request->result == -ENOENT) {
@@ -1570,14 +1571,13 @@  rbd_img_obj_request_read_callback(struct rbd_obj_request *obj_request)
 		else
 			zero_pages(obj_request->pages, 0, length);
 		obj_request->result = 0;
-		obj_request->xferred = length;
 	} else if (xferred < length && !obj_request->result) {
 		if (obj_request->type == OBJ_REQUEST_BIO)
 			zero_bio_chain(obj_request->bio_list, xferred);
 		else
 			zero_pages(obj_request->pages, xferred, length);
-		obj_request->xferred = length;
 	}
+	obj_request->xferred = length;
 	obj_request_done_set(obj_request);
 }