On Thu, 14 May 2015, Ilya Dryomov wrote:
> As part of unmap sequence, kernel client has to talk to the OSDs to
> teardown watch on the header object. If none of the OSDs are available
> it would hang forever, until interrupted by a signal - when that
> happens we follow through with the rest of unmap procedure (i.e.
> unregister the device and put all the data structures) and the unmap is
> still considired successful (rbd cli tool exits with 0). The watch on
> the userspace side should eventually timeout so that's fine.
>
> This isn't very nice, because various userspace tools (pacemaker rbd
> resource agent, for example) then have to worry about setting up their
> own timeouts. Timeout it with mount_timeout (60 seconds by default).
>
> This also changes rbd_obj_request_wait() to return -EINTR instead of
> -ERESTARTSYS if interrupted - I don't think we want to mess with
> restarts for any of rbd map/unmap requests.
>
> Signed-off-by: Ilya Dryomov <idryomov@xxxxxxxxx>
Reviewed-by: Sage Weil <sage@xxxxxxxxxx>
> ---
> drivers/block/rbd.c | 40 +++++++++++++++++++++++++++++-----------
> 1 file changed, 29 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
> index 349115ae3bc2..3fabdfdbc0b1 100644
> --- a/drivers/block/rbd.c
> +++ b/drivers/block/rbd.c
> @@ -1564,21 +1564,37 @@ static void rbd_obj_request_end(struct rbd_obj_request *obj_request)
> * Wait for an object request to complete. If interrupted, cancel the
> * underlying osd request.
> */
> -static int rbd_obj_request_wait(struct rbd_obj_request *obj_request)
> +static int __rbd_obj_request_wait(struct rbd_obj_request *obj_request,
> + unsigned long timeout)
> {
> - int ret;
> + long ret;
>
> dout("%s %p\n", __func__, obj_request);
> -
> - ret = wait_for_completion_interruptible(&obj_request->completion);
> - if (ret < 0) {
> - dout("%s %p interrupted\n", __func__, obj_request);
> + ret = wait_for_completion_interruptible_timeout(
> + &obj_request->completion, timeout);
> + if (ret <= 0) {
> + if (ret == 0)
> + ret = -ETIMEDOUT;
> + else
> + ret = -EINTR;
> rbd_obj_request_end(obj_request);
> - return ret;
> + } else {
> + ret = 0;
> }
>
> - dout("%s %p done\n", __func__, obj_request);
> - return 0;
> + dout("%s %p ret %d\n", __func__, obj_request, (int)ret);
> + return ret;
> +}
> +
> +static int rbd_obj_request_wait(struct rbd_obj_request *obj_request)
> +{
> + return __rbd_obj_request_wait(obj_request, MAX_SCHEDULE_TIMEOUT);
> +}
> +
> +static int rbd_obj_request_wait_timeo(struct rbd_obj_request *obj_request,
> + unsigned long timeout)
> +{
> + return __rbd_obj_request_wait(obj_request, timeout);
> }
>
> static void rbd_img_request_complete(struct rbd_img_request *img_request)
> @@ -3121,7 +3137,9 @@ static struct rbd_obj_request *rbd_obj_watch_request_helper(
> struct rbd_device *rbd_dev,
> bool watch)
> {
> - struct ceph_osd_client *osdc = &rbd_dev->rbd_client->client->osdc;
> + struct ceph_client *client = rbd_dev->rbd_client->client;
> + struct ceph_osd_client *osdc = &client->osdc;
> + unsigned long timeout = client->options->mount_timeout * HZ;
> struct rbd_obj_request *obj_request;
> int ret;
>
> @@ -3148,7 +3166,7 @@ static struct rbd_obj_request *rbd_obj_watch_request_helper(
> if (ret)
> goto out;
>
> - ret = rbd_obj_request_wait(obj_request);
> + ret = rbd_obj_request_wait_timeo(obj_request, timeout);
> if (ret)
> goto out;
>
> --
> 1.9.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> 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@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
