Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rbd-nbd: support optionally setting device timeout #19436

Merged
merged 1 commit into from Dec 15, 2017

Conversation

Projects
None yet
4 participants
@trociny
Copy link
Contributor

commented Dec 11, 2017

@dillaman
Copy link
Contributor

left a comment

lgtm

@@ -85,6 +86,7 @@ static void usage()
<< " --nbds_max <limit> Override for module param nbds_max\n"
<< " --max_part <limit> Override for module param max_part\n"
<< " --exclusive Forbid writes by other clients\n"
<< " --timeout <seconds> Set nbd request timeout\n"

This comment has been minimized.

Copy link
@tchaikov

tchaikov Dec 12, 2017

Contributor
/home/jenkins-build/build/workspace/ceph-pull-requests/src/test/cli/rbd/help.t: failed
--- /home/jenkins-build/build/workspace/ceph-pull-requests/src/test/cli/rbd/help.t
+++ /home/jenkins-build/build/workspace/ceph-pull-requests/src/test/cli/rbd/help.t.err
@@ -1148,6 +1148,7 @@
   usage: rbd nbd map [--pool <pool>] [--image <image>] [--snap <snap>] 
                      [--read-only] [--exclusive] [--device <device>] 
                      [--nbds_max <nbds_max>] [--max_part <max_part>] 
+                     [--timeout <timeout>] 
                      <image-or-snap-spec> 
   
   Map image to a nbd device.
@@ -1165,6 +1166,7 @@
     --device arg          specify nbd device
     --nbds_max arg        override module param nbds_max
     --max_part arg        override module param max_part
+    --timeout arg         set nbd request timeout (seconds)
   
   rbd help nbd unmap
   usage: rbd nbd unmap 
...
The following tests FAILED:
	  2 - run-cli-tests (Failed)

this breaks run-cli-tests

This comment has been minimized.

Copy link
@trociny

trociny Dec 12, 2017

Author Contributor

@tchaikov updated. Thanks

rbd-nbd: support optionally setting device timeout
Fixes: http://tracker.ceph.com/issues/22333
Signed-off-by: Mykola Golub <to.my.trociny@gmail.com>

@trociny trociny force-pushed the trociny:wip-22333 branch from 67132f6 to bad51ff Dec 12, 2017

make check passes

@dillaman dillaman merged commit aa80cb9 into ceph:master Dec 15, 2017

5 checks passed

Docs: build check OK - docs built
Details
Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
make check make check succeeded
Details
make check (arm64) make check succeeded
Details

@trociny trociny deleted the trociny:wip-22333 branch Dec 15, 2017

@ldidry

This comment has been minimized.

Copy link

commented Feb 21, 2018

This has been merged to master in december, but I don't see it in new releases (nor v12.2.3 nor v13.0.1, both from less than a month ago).

Shouldn't it be backported to v12 and v13 if possible? (I would have great use of it and I use v12)

@trociny

This comment has been minimized.

Copy link
Contributor Author

commented Feb 21, 2018

This was not planned to be backported to v12.2.X (see "Backport" field in the tracker ticket [1]).

It will go to mimic (v13) though. I think it is too late for v12.2.3. It may be backported to 12.2.4 if @dillaman does not have any objections.

[1] http://tracker.ceph.com/issues/22333

@ldidry

This comment has been minimized.

Copy link

commented Feb 21, 2018

Thank you!

The redmine ticket didn't have any backport nor target version, so I thought that it would be in all last versions. Now I'll know that it just means "target: last version"

@dillaman

This comment has been minimized.

Copy link
Contributor

commented Feb 21, 2018

We generally try to restrict features to new releases and only backport bug fixes to lessen the load on our volunteer backporting team (and to reduce risks of regressions on stable releases). The next mimic dev snapshot release will be cut this week or next and will include the change.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.