[ambari] branch trunk updated: AMBARI-24991. Commands timeout if stdout has non-unicode symbols. (aonishuk)

[aonishuk]

This is an automated email from the ASF dual-hosted git repository.

aonishuk pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 17f9098  AMBARI-24991. Commands timeout if stdout has non-unicode 
symbols. (aonishuk)
17f9098 is described below

commit 17f90987b1aa2b0fbb0bf787200d9148f0d6e785
Author: Andrew Onishuk <aonis...@hortonworks.com>
AuthorDate: Tue Dec 4 14:24:37 2018 +0200

    AMBARI-24991. Commands timeout if stdout has non-unicode symbols. (aonishuk)
---
 ambari-agent/src/main/python/ambari_agent/ActionQueue.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ambari-agent/src/main/python/ambari_agent/ActionQueue.py 
b/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
index 072083a..3c979a6 100644
--- a/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
+++ b/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
@@ -336,8 +336,8 @@ class ActionQueue(threading.Thread):
 
     role_result = self.commandStatuses.generate_report_template(command)
     role_result.update({
-      'stdout': command_result['stdout'],
-      'stderr': command_result['stderr'],
+      'stdout': unicode(command_result['stdout'], errors='replace'),
+      'stderr': unicode(command_result['stderr'], errors='replace'),
       'exitCode': command_result['exitcode'],
       'status': status,
     })