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

rgw: update outdated debug func name #17440

Merged
merged 1 commit into from Oct 18, 2017

Conversation

mikulely
Copy link
Contributor

@mikulely mikulely commented Sep 4, 2017

No description provided.

@mikulely
Copy link
Contributor Author

@joscollin @cbodley mind to merge?

Copy link
Member

@joscollin joscollin left a comment

Choose a reason for hiding this comment

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

Looks good to me.

@@ -10645,13 +10645,13 @@ int RGWRados::Object::Read::iterate(int64_t ofs, int64_t end, RGWGetDataCB *cb)
while (!done) {
r = data->wait_next_io(&done);
if (r < 0) {
dout(10) << "get_obj_iterate() r=" << r << ", canceling all io" << dendl;
dout(10) << __func__ << " r=" << r << ", cancelling all io" << dendl;
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: canceling is also a correct spelling, so i'd prefer not to change it

Copy link
Member

Choose a reason for hiding this comment

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

@cbodley canceling is American and cancelling is British. So for people on the Eastern side of the world cancelling looks correct :-D
https://english.stackexchange.com/questions/42745/canceling-or-cancelling

I think, let's follow American, as cbodley suggests.

Signed-off-by: Jiaying Ren <jiaying.ren@umcloud.com>
@mikulely
Copy link
Contributor Author

Jenkins, retest this please.

@joscollin
Copy link
Member

@mattbenjamin mattbenjamin merged commit c584a8d into ceph:master Oct 18, 2017
@mikulely mikulely deleted the cleanup-iterate branch October 18, 2017 12:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants