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

mimic: rbd: use the ordered throttle for the export action #30178

Merged
merged 1 commit into from Oct 8, 2019

Conversation

@smithfarm
Copy link
Contributor

smithfarm commented Sep 5, 2019

@smithfarm smithfarm added this to the mimic milestone Sep 5, 2019
@smithfarm smithfarm added the rbd label Sep 5, 2019
@smithfarm smithfarm requested a review from dillaman Sep 5, 2019
@smithfarm

This comment has been minimized.

Copy link
Contributor Author

smithfarm commented Sep 7, 2019

All tests passed, and then suddenly for no apparent reason:

156/157 Test #128: unittest_alloc_bench ....................   Passed  766.66 sec
./run-make-check.sh: line 36: 24585 Terminated              $DRY_RUN ctest $CHECK_MAKEOPTS --output-on-failure
@smithfarm

This comment has been minimized.

Copy link
Contributor Author

smithfarm commented Sep 7, 2019

jenkins test make check

Copy link
Contributor

dillaman left a comment

👍

@yuriw

This comment has been minimized.

Copy link
Contributor

yuriw commented Oct 4, 2019

@dillaman dillaman force-pushed the smithfarm:wip-40500-mimic branch from 33d0df9 to 60ce5e8 Oct 7, 2019
{
librbd::image_info_t info;
int64_t r = image.stat(info, sizeof(info));
if (r < 0)
return r;

int fd;
int max_concurrent_ops;
int max_concurrent_ops = g_conf->get_val<int64_t>("rbd_concurrent_management_ops");

This comment has been minimized.

Copy link
@dillaman

dillaman Oct 7, 2019

Contributor

Tweaked this line to fix backport conflict re: uint64_t vs int64_t type

@smithfarm

This comment has been minimized.

Copy link
Contributor Author

smithfarm commented Oct 7, 2019

@dillaman The compiler now emits a "wall of text" starting with:

/home/jenkins-build/build/workspace/ceph-pull-requests/src/tools/rbd/action/Export.cc:1:1: error: 'src' does not name a type
 src/tools/rbd/action/Export.cc
 ^~~
In file included from /home/jenkins-build/build/workspace/ceph-pull-requests/src/tools/rbd/action/Export.cc:5:
/home/jenkins-build/build/workspace/ceph-pull-requests/src/include/compat.h:170:34: error: 'off_t' has not been declared
 int ceph_posix_fallocate(int fd, off_t offset, off_t len);
                                  ^~~~~
/home/jenkins-build/build/workspace/ceph-pull-requests/src/include/compat.h:170:48: error: 'off_t' has not been declared
 int ceph_posix_fallocate(int fd, off_t offset, off_t len);
                                                ^~~~~
This allows exports to STDOUT to use multiple concurrent operations
and also fixes a potential race condition with concurrent callbacks
and file seeking.

Fixes: http://tracker.ceph.com/issues/40435
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 751bf69)

Conflicts:
	src/tools/rbd/action/Export.cc
- mimic has g_conf->get_val and int64_t "rbd_concurrent_management_ops"
@dillaman dillaman force-pushed the smithfarm:wip-40500-mimic branch from 60ce5e8 to 818b733 Oct 7, 2019
@yuriw yuriw merged commit bb19d47 into ceph:mimic Oct 8, 2019
3 of 4 checks passed
3 of 4 checks passed
Signed-off-by one or more commits in this PR are not signed
Details
Docs: build check OK - docs built
Details
Unmodified Submodules submodules for project are unmodified
Details
make check make check succeeded
Details
@smithfarm smithfarm deleted the smithfarm:wip-40500-mimic branch Oct 8, 2019
@smithfarm

This comment has been minimized.

Copy link
Contributor Author

smithfarm commented Oct 8, 2019

@dillaman Thanks for taking care :-)

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