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.

Sign up for GitHub

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

Jump to bottom

rgw: don't loop forever when reading data from 0 sized segment. #11567

Merged
merged 1 commit into from Oct 19, 2016
Merged

rgw: don't loop forever when reading data from 0 sized segment. #11567

merged 1 commit into from Oct 19, 2016

Conversation

mdw-at-linuxbox
Copy link
Contributor

@mdw-at-linuxbox mdw-at-linuxbox commented Oct 19, 2016 •
edited by ghost

http://tracker.ceph.com/issues/17692

The 0 sized segment can arise depending on how
the client uploads the object in the first place.
The cpu loop then happens during a swift `GET'.

Also, don't object to byte ranges on DL/SL objects.

Signed-off-by: Marcus Watts mwatts@redhat.com

yehudasa
yehudasa reviewed Oct 19, 2016
View reviewed changes
src/rgw/rgw_op.cc
@@ -1347,13 +1362,6 @@ void RGWGetObj::execute()
if (op_ret < 0)
goto done_err;

// for range requests with obj size 0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mdw-at-linuxbox was this block in the original patch?

@mdw-at-linuxbox
Don't loop forever when reading data from 0 sized segment.
46c5f97 
The 0 sized segment can arise depending on how
the client uploads the object in the first place.
The cpu loop then happens during a swift `GET'.

Signed-off-by: Marcus Watts <mwatts@redhat.com>
@mdw-at-linuxbox
Copy link
Contributor Author

Yehuda asked me to remove the fix for byte ranges on SL/DL objects
from this patch. This concerns code that was apparently added to fix the problem identified in http://tracker.ceph.com/issues/16388 . Without that fix this code will not pass my tests. However, the patch should be very nearly identical to what I had for jewel.

Anyways, I've done a "force push", so should be all set there.

@yehudasa yehudasa merged commit 48bb2cd into master Oct 19, 2016
@liewegas liewegas changed the title Don't loop forever when reading data from 0 sized segment. rgw: don't loop forever when reading data from 0 sized segment. Oct 19, 2016
@liewegas
Copy link
Member

Please use the usual convention for naming pull requests (subsystem: short description) as this feeds directly into the script that generates release notes and it's tedious to clean up at release time. (We should also use the same convention for commits themselves, too, so it's clear e.g., that this commit relates to rgw)

@tchaikov tchaikov deleted the wip-master-rgw-0lenfix2 branch October 20, 2016 02:53
@tchaikov
Copy link
Contributor

@liewegas fwiw, i just included your comment in #11570. so we can reference it in future.

@ktdreyer ktdreyer mentioned this pull request Oct 24, 2016
Closed
@cbodley cbodley mentioned this pull request Oct 24, 2016
Merged
@theanalyst theanalyst added the rgw label Dec 5, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yehudasa yehudasa yehudasa left review comments

Assignees

@yehudasa yehudasa

@cbodley cbodley

Labels
rgw
Projects
None yet
Milestone
No milestone
6 participants
@mdw-at-linuxbox @liewegas @tchaikov @yehudasa @theanalyst @cbodley