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

mgr: always free allocated MgrPyModule #14507

Merged
merged 1 commit into from Apr 18, 2017

Conversation

Projects
None yet
4 participants
@tchaikov
Contributor

tchaikov commented Apr 13, 2017

use unique_ptr to manage the lifecycle of MgrPyModule and ServeThread,
it's easier and safer. without this chance, we don't free allocated
MgrPyModule if it fails to load().

Fixes: http://tracker.ceph.com/issues/19590
Signed-off-by: Kefu Chai kchai@redhat.com

mgr: always free allocated MgrPyModule
use unique_ptr to manage the lifecycle of MgrPyModule and ServeThread,
it's easier and safer. without this chance, we don't free allocated
MgrPyModule if it fails to load().

Fixes: http://tracker.ceph.com/issues/19590
Signed-off-by: Kefu Chai <kchai@redhat.com>

@tchaikov tchaikov requested review from liewegas and jcsp Apr 13, 2017

@jcsp

jcsp approved these changes Apr 15, 2017

@yuriw yuriw merged commit 721929d into ceph:master Apr 18, 2017

3 checks passed

Signed-off-by all commits in this PR are signed
Details
Unmodifed Submodules submodules for project are unmodified
Details
default Build finished.
Details

@tchaikov tchaikov deleted the tchaikov:wip-19590 branch Apr 19, 2017

Abhishekvrshny added a commit to Abhishekvrshny/ceph that referenced this pull request Jul 13, 2017

rgw: user quota may not adjust on bucket removal
Description:
If the user/admin removes a bucket using --force/--purge-objects options with s3cmd/radosgw-admin respectively, the user stats will continue to reflect the deleted objects for quota purposes, and there seems to be no way to reset them. User stats need to be sync'ed prior to bucket removal.

Solution:
Sync user stats before removing a bucket.

Fixes: ceph#14507
Signed-off-by: Edward Yang <eyang@us.fujitsu.com>
(cherry picked from commit 0650799)

Conflicts:

	src/rgw/rgw_op.cc
            reordering the check seqence and replace some op_ret to ret

Backport Change:
We remove the `tenant` parameter because this feature is not introduced on hammer version.
The rgw multi-tenant feature is introduced on pr#6784 (ceph#6784)
This feature is supported from v10.0.2 and later version.
(cherry picked from commit c722d00)

Conflicts:
	src/rgw/rgw_op.cc
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment