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

octopus: radosgw-admin: skip GC init on read-only admin ops #45423

Merged
merged 1 commit into from
May 19, 2022

Conversation

cfsnyder
Copy link
Contributor

backport tracker: https://tracker.ceph.com/issues/50802


backport of #41027
parent tracker: https://tracker.ceph.com/issues/50520

this backport was staged using ceph-backport.sh version 16.0.0.6848
find the latest version at https://github.com/ceph/ceph/blob/master/src/script/ceph-backport.sh

@cfsnyder cfsnyder added this to the octopus milestone Mar 16, 2022
gc = new RGWGC();
gc->initialize(cct, this);
} else {
ldpp_dout(dpp, 5) << "note: GC not initialized" << dendl;
Copy link
Contributor

Choose a reason for hiding this comment

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

/ceph-15.2.16-105-g682160e1/src/rgw/rgw_rados.cc:22:
/ceph-15.2.16-105-g682160e1/src/rgw/rgw_rados.cc: In member function ‘int RGWRados::init_complete()’:
/ceph-15.2.16-105-g682160e1/src/rgw/rgw_rados.cc:1191:15: error: ‘dpp’ was not declared in this scope
     ldpp_dout(dpp, 5) << "note: GC not initialized" << dendl;
               ^~~

Fixes: https://tracker.ceph.com/issues/50520

Signed-off-by: Mark Kogan <mkogan@redhat.com>
(cherry picked from commit 9ac1991)

Conflicts:
	src/rgw/rgw_admin.cc
	src/rgw/rgw_rados.h
	src/rgw/rgw_sal.cc
	src/rgw/rgw_sal.h

Cherry-pick notes:
- src/rgw/rgw_admin.cc: conflicts due to differences in op lists
- src/rgw/rgw_rados.h: conflicts due to changes to unrelated  method signatures
- src/rgw/rgw_sal.cc: conflicts due to octopus missing a couple of methods from later releases
- src/rgw/rgw_sal.h: conflicts due to changes to unrelated method seignatures
- src/rgw/rgw_rados.cc: use of ldpp_dout vs. ldout
@cbodley
Copy link
Contributor

cbodley commented May 19, 2022

jenkins test api

@yuriw yuriw merged commit ffda8f3 into ceph:octopus May 19, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants