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: fix ECANCELED handling in rgw_get_system_obj() #12225

Closed
wants to merge 1 commit into from

Conversation

@yehudasa
Copy link
Member

commented Nov 29, 2016

@theanalyst

This comment has been minimized.

Copy link
Member

commented Jan 11, 2017

there is an accidental submodule change in the pr

@robbat2

This comment has been minimized.

Copy link
Contributor

commented Mar 30, 2017

@yehudasa DreamObjects has been running this patch on top of Jewel without the submodule piece for several months now, please included in master & 10.2.7.

@yehudasa yehudasa force-pushed the yehudasa:wip-17996 branch from e746274 to d3d64ed Mar 31, 2017
Fixes: http://tracker.ceph.com/issues/17996

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
@theanalyst

This comment has been minimized.

Copy link
Member

commented May 31, 2017

@yehudasa ping

@@ -47,6 +47,11 @@ int rgw_get_system_obj(RGWRados *rgwstore, RGWObjectCtx& obj_ctx, rgw_bucket& bu
int request_len = READ_CHUNK_LEN;
rgw_obj obj(bucket, key);

obj_version original_readv;

This comment has been minimized.

Copy link
@amitkumar50

amitkumar50 Aug 23, 2017

Contributor
  1. Let's initialize original_readv.

  2. if (!original_readv.empty())) //String is empty=> .empty() return 0
    {
    string empty; return;
    }

    Just thinking, Why can't we return from
    if (objv_tracker && !objv_tracker->read_version.empty()) {
    original_readv = objv_tracker->read_version;
    <<<<return (value)>>>>
    }
    This will save processing code inside do-while before rop.read().

@robbat2

This comment has been minimized.

Copy link
Contributor

commented Oct 6, 2017

@yehudasa ping, please merge! Dreamhost has been running this for many months.

@oritwas

This comment has been minimized.

Copy link
Contributor

commented Oct 7, 2017

jenkins test this please

@oritwas
oritwas approved these changes Oct 7, 2017
@yehudasa yehudasa added the needs-qa label Oct 7, 2017
@oritwas

This comment has been minimized.

Copy link
Contributor

commented Oct 9, 2017

@yehudasa , @robbat2 this was merged to master as part of #11485

@robbat2

This comment has been minimized.

Copy link
Contributor

commented Oct 9, 2017

@oritwas clarification: I'm waiting for it to merge to Jewel

@yehudasa yehudasa changed the base branch from master to jewel Oct 9, 2017
@yehudasa yehudasa changed the base branch from jewel to master Oct 9, 2017
@yehudasa

This comment has been minimized.

Copy link
Member Author

commented Oct 9, 2017

@robbat2 can you send a PR against jewel? rebasing this one doesn't work.

robbat2 added a commit to dreamhost/ceph that referenced this pull request Oct 11, 2017
Fixes: http://tracker.ceph.com/issues/17996
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
See-Also: ceph#12225 (comment)
(cherry picked from commit d3d64ed)
@tchaikov

This comment has been minimized.

Copy link
Contributor

commented Nov 24, 2017

retest this please.

@tchaikov

This comment has been minimized.

Copy link
Contributor

commented Nov 24, 2017

In file included from /home/jenkins-build/build/workspace/ceph-dev-new-build/ARCH/x86_64/AVAILABLE_ARCH/x86_64/AVAILABLE_DIST/centos7/DIST/centos7/MACHINE_SIZE/huge/release/13.0.0-3542-gd33628d/rpm/el7/BUILD/ceph-13.0.0-3542-gd33628d/src/test/rgw/test_rgw_common.h:18:0,
                 from /home/jenkins-build/build/workspace/ceph-dev-new-build/ARCH/x86_64/AVAILABLE_ARCH/x86_64/AVAILABLE_DIST/centos7/DIST/centos7/MACHINE_SIZE/huge/release/13.0.0-3542-gd33628d/rpm/el7/BUILD/ceph-13.0.0-3542-gd33628d/src/test/rgw/test_rgw_common.cc:1:
/home/jenkins-build/build/workspace/ceph-dev-new-build/ARCH/x86_64/AVAILABLE_ARCH/x86_64/AVAILABLE_DIST/centos7/DIST/centos7/MACHINE_SIZE/huge/release/13.0.0-3542-gd33628d/rpm/el7/BUILD/ceph-13.0.0-3542-gd33628d/src/rgw/rgw_rados.h:2670:10: error: 'void RGWRados::SystemObject::invalidate_state()' cannot be overloaded
     void invalidate_state();
          ^
/home/jenkins-build/build/workspace/ceph-dev-new-build/ARCH/x86_64/AVAILABLE_ARCH/x86_64/AVAILABLE_DIST/centos7/DIST/centos7/MACHINE_SIZE/huge/release/13.0.0-3542-gd33628d/rpm/el7/BUILD/ceph-13.0.0-3542-gd33628d/src/rgw/rgw_rados.h:2668:10: error: with 'void RGWRados::SystemObject::invalidate_state()'
     void invalidate_state();
          ^

this PR does not build

@tchaikov

This comment has been minimized.

Copy link
Contributor

commented Nov 24, 2017

@oritwas @yehudasa so it has been merge as e67a3b5 , shall we close this PR ?

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