orchestra: allow runtime logging for sh

When run.run is used with 'stdout' argument, the output of run command
is read to the given stream and logged with corresponding level only after
completion, which is different from the default behaviour. This 'hides'
useful information when, for example, the command is hung or stuck.
Aso it is usually handy when there are some data can be found
in the log for a prolonged command execution during runtime.

This patch addresses the issue.

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>

diff --git a/teuthology/orchestra/run.py b/teuthology/orchestra/run.py
index f4507e8c5622ef550ea6b22a3f83bd0ccd3cd10c..33c50e35c75f9bea85cf9947bc646508af03bf0c 100644 (file)
--- a/teuthology/orchestra/run.py
+++ b/teuthology/orchestra/run.py
@@ -260,12 +260,22 @@ def quote(args):
     return ' '.join(_quote(args))
 
 
-def copy_to_log(f, logger, loglevel=logging.INFO):
+def copy_to_log(f, logger, loglevel=logging.INFO, capture=None):
+    """
+    Copy line by line from file in f to the log from logger
+
+    :param f: source stream object
+    :param logger: the destination logger object
+    :param loglevel: the level of logging data
+    :param capture: an optional stream object for data copy
+    """
     # Work-around for http://tracker.ceph.com/issues/8313
     if isinstance(f, ChannelFile):
         f._flags += ChannelFile.FLAG_BINARY
 
     for line in f:
+        if capture:
+            capture.write(line)
         line = line.rstrip()
         # Second part of work-around for http://tracker.ceph.com/issues/8313
         try:
@@ -294,12 +304,7 @@ def copy_file_to(src, logger, stream=None):
     :param stream: an optional file-like object which will receive a copy of
                    src.
     """
-    if stream is not None:
-        shutil.copyfileobj(src, stream)
-        stream.seek(0)
-        src = stream
-    copy_to_log(src, logger)
-
+    copy_to_log(src, logger, capture=stream)
 
 def spawn_asyncresult(fn, *args, **kwargs):
     """