]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph: ignore BrokenPipeError when printing help 37100/head
authorErnesto Puerta <epuertat@redhat.com>
Fri, 11 Sep 2020 10:10:16 +0000 (12:10 +0200)
committerErnesto Puerta <epuertat@redhat.com>
Tue, 15 Sep 2020 18:20:43 +0000 (20:20 +0200)
ignore BrokenPipeError which is thrown when piping the output of ceph
CLI to a tool which might close its stdin before ceph CLI sends the
whole help message.

Follow approach suggested by Kefu: https://github.com/python/cpython/commit/7b0ed43af55c1e2844aa0ccd5e088b2ddd38dbdb
This doesn't manage the clean-up/exit logic, as that's deferred to the
last part of the __main__ code.

Fixes: https://tracker.ceph.com/issues/47400
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
src/ceph.in

index d1f4d802214e9d87f44fc3f1695a7c06191ffa21..37445cf13e7ea8d2da4111da35f9f9ce9b6d83bf 100755 (executable)
@@ -376,8 +376,11 @@ daemonperf {type.id | path} list|ls [stat-pats] [priority]
 
 def do_extended_help(parser, args, target, partial):
     def help_for_sigs(sigs, partial=None):
-        sys.stdout.write(format_help(parse_json_funcsigs(sigs, 'cli'),
-                         partial=partial))
+        try:
+            sys.stdout.write(format_help(parse_json_funcsigs(sigs, 'cli'),
+                             partial=partial))
+        except BrokenPipeError:
+            pass
 
     def help_for_target(target, partial=None):
         # wait for osdmap because we know this is sent after the mgrmap