]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph.in: bypass codec when writing raw binary data 20763/head
authorKefu Chai <kchai@redhat.com>
Wed, 7 Mar 2018 04:05:10 +0000 (12:05 +0800)
committerKefu Chai <kchai@redhat.com>
Wed, 7 Mar 2018 06:10:29 +0000 (14:10 +0800)
See-also: 615f8f45
Fixes: http://tracker.ceph.com/issues/23185
Signed-off-by: Oleh Prypin <oleh@pryp.in>
(cherry picked from commit 8fc67075c6d7d4443747f53687e498439f80b57a)

Conflicts: this change was introduced to master by 8fc67075. but that commit
  involves a lot of py3 compatibility changes, which are not the focus of
  jewel or this fix. so i am only cherry-pick the change writing buffer
  returned by asock to stdout.

src/ceph.in

index 7d710263f792a4886f080ced05c8932191dd1c5f..8ce06a7ae72741372df22cc16f1c2165276973ab 100755 (executable)
@@ -639,7 +639,7 @@ def main():
         return 0
     elif sockpath:
         try:
-            print(admin_socket(sockpath, childargs, format))
+            raw_stdout.write(admin_socket(sockpath, childargs, format))
         except Exception as e:
             print('admin_socket: {0}'.format(e))
             print('admin_socket: {0}'.format(e), file=sys.stderr)