]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Call Rados.shutdown() explicitly before exit 3168/head
authorDan Mick <dan.mick@redhat.com>
Wed, 10 Dec 2014 21:19:53 +0000 (13:19 -0800)
committerDan Mick <dan.mick@redhat.com>
Thu, 11 Dec 2014 05:30:11 +0000 (21:30 -0800)
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)

src/ceph.in

index 4cc5c42470d2bda610598b728fcba17590369390..0701e292f59ff78b97c1bdd4b4f56a8095f9cc30 100755 (executable)
@@ -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)