pybind: return a tuple in run_in_thread() if interrupted

Callers expect run_in_thread() to return a tuple, but it
returns an int. When interrupt the function it would raise
an iterable exception.

This patch fix the bug, and it would just output a message
like: "Error EINTR: Interrupted!"

Signed-off-by: Javeme <javaloveme@gmail.com>

diff --git a/src/pybind/ceph_argparse.py b/src/pybind/ceph_argparse.py
index c3aef846e19e658889cef69ac8ef1c0d292afc31..b60e71fb1b5709c45e87cb27ea23dfc8888d4695 100644 (file)
--- a/src/pybind/ceph_argparse.py
+++ b/src/pybind/ceph_argparse.py
@@ -1191,7 +1191,7 @@ def run_in_thread(target, *args, **kwargs):
         interrupt = True
 
     if interrupt:
-        t.retval = -errno.EINTR
+        t.retval = -errno.EINTR, None, 'Interrupted!'
     if t.exception:
         raise t.exception
     return t.retval