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: librgw shut #12972

Merged
merged 3 commits into from Jan 18, 2017

Conversation

Projects
None yet
2 participants
@mattbenjamin
Contributor

mattbenjamin commented Jan 18, 2017

Fix librgw shutdown after abnormal termination of library client/nfs-ganesha.

Verified by forcing nfs-ganesha to exit due to network setup failure.

@mattbenjamin mattbenjamin requested a review from cbodley Jan 18, 2017

@mattbenjamin mattbenjamin changed the title from Wip librgw shut to rgw: librgw shut Jan 18, 2017

@@ -182,5 +183,5 @@ int rgw_tools_init(CephContext *cct)
void rgw_tools_cleanup()
{
ext_mime_map.clear();
delete ext_mime_map;

This comment has been minimized.

@cbodley

cbodley Jan 18, 2017

Contributor

assign to null after delete

mattbenjamin added some commits Jan 18, 2017

rgw_file: signal RGWLibFrontend shutdown correctly
The shutdown member of RGWLibProcess should be set.

Fixes: http://tracker.ceph.com/issues/18585

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
rgw: s/static std::map/static pointer/ for ext_mime_map
In some librgw shutdown cases, it appears that the shared
object runtime has partially destructed the static map when
our shutdown code is running.

Fixes: http://tracker.ceph.com/issues/18585

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
librgw: remove call to crypto::shutdown
The call is cognate to removed code in radosgw, and triggers an
assert that the crypto module has already been shutdown.  With this
and preceding changes, I see clean shutdown on abnormal termination
of nfs-ganesha during startup.

Fixes: http://tracker.ceph.com/issues/18585

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>

@mattbenjamin mattbenjamin merged commit 611b712 into ceph:master Jan 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment