Skip to content

mgr: always free allocated MgrPyModule#14507

Merged
yuriw merged 1 commit intoceph:masterfrom
tchaikov:wip-19590
Apr 18, 2017
Merged

mgr: always free allocated MgrPyModule#14507
yuriw merged 1 commit intoceph:masterfrom
tchaikov:wip-19590

Conversation

@tchaikov
Copy link
Contributor

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

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>
@yuriw yuriw merged commit 721929d into ceph:master Apr 18, 2017
@tchaikov tchaikov deleted the wip-19590 branch April 19, 2017 01:24
Abhishekvrshny pushed a commit to Abhishekvrshny/ceph that referenced this pull request Jul 13, 2017
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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants