From: Dan Mick <dan.mick@redhat.com>
Date: Wed, 10 Dec 2014 21:19:53 +0000 (-0800)
Subject: Call Rados.shutdown() explicitly before exit
X-Git-Tag: v0.87.1~11^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=319f9c9352bfd1b95bd685500922e6cee2199b34;p=ceph.git

Call Rados.shutdown() explicitly before exit

This is mostly a demonstration of good behavior, as the resources will
be reclaimed on exit anyway.

Signed-off-by: Dan Mick <dan.mick@redhat.com>
(cherry picked from commit b038e8fbf9103cc42a4cde734b3ee601af6019ea)
---

diff --git a/src/ceph.in b/src/ceph.in
index 4cc5c42470d2b..0701e292f59ff 100755
--- a/src/ceph.in
+++ b/src/ceph.in
@@ -856,4 +856,8 @@ def main():
     return 0
 
 if __name__ == '__main__':
-    sys.exit(main())
+    retval = main()
+    # shutdown explicitly; Rados() does not
+    if cluster_handle:
+        cluster_handle.shutdown()
+    sys.exit(retval)