orchestra: decode('utf-8') before logging

http://tracker.ceph.com/issues/8313 Fixes: #8313

Signed-off-by: Loic Dachary <loic@dachary.org>

diff --git a/teuthology/orchestra/run.py b/teuthology/orchestra/run.py
index 0af7db5f3a49c5f44ac1f499fb56029011ae90b0..2670a50ee066cc028b5aab75d031e4c7dde41632 100644 (file)
--- a/teuthology/orchestra/run.py
+++ b/teuthology/orchestra/run.py
@@ -196,7 +196,7 @@ def copy_to_log(f, logger, loglevel=logging.INFO):
         # Second part of work-around for http://tracker.ceph.com/issues/8313
         try:
             line = unicode(line, 'utf-8', 'replace').encode('utf-8')
-            logger.log(loglevel, line)
+            logger.log(loglevel, line.decode('utf-8'))
         except (UnicodeDecodeError, UnicodeEncodeError):
             logger.exception("Encountered unprintable line in command output")