Catch any Unicode errors that manage to sneak in

Signed-off-by: Zack Cerza <zack.cerza@inktank.com>

diff --git a/teuthology/orchestra/run.py b/teuthology/orchestra/run.py
index 2fd8f250332492a9b40dd7b38b245d9292a23367..c899b1585a1501f34bf818f3ff2d9f0266ea12db 100644 (file)
--- a/teuthology/orchestra/run.py
+++ b/teuthology/orchestra/run.py
@@ -137,8 +137,11 @@ def copy_to_log(f, logger, loglevel=logging.INFO):
     for line in f.xreadlines():
         line = line.rstrip()
         # Second part of work-around for http://tracker.ceph.com/issues/8313
-        line = unicode(line, 'utf-8', 'replace').encode('utf-8')
-        logger.log(loglevel, line)
+        try:
+            line = unicode(line, 'utf-8', 'replace').encode('utf-8')
+            logger.log(loglevel, line)
+        except (UnicodeDecodeError, UnicodeEncodeError):
+            logger.exception("Encountered unprintable line in command output")
 
 
 def copy_and_close(src, fdst):