Merge pull request ceph#1869 from ceph/wip-pybind-timeout

pybind/rados: Fix timeouts for small t

Reviewed-by: Josh Durgin <[email protected]>

src/pybind/rados.py

@@ -159,7 +159,7 @@ def run_in_thread(target, args, timeout=0):
         # poll for thread exit
         while t.is_alive():
             t.join(POLL_TIME_INCR)
-            if timeout:
+            if timeout and t.is_alive():
                 countdown = countdown - POLL_TIME_INCR
                 if countdown <= 0:
                     raise KeyboardInterrupt