incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smoha...@apache.org
Subject [1/2] git commit: AMBARI-2764. Improve logging when tasks fail due to timeouts (part-II). (smohanty)
Date Tue, 30 Jul 2013 21:25:34 GMT
Updated Branches:
  refs/heads/trunk 3c092f84a -> 49dfd03c4


AMBARI-2764. Improve logging when tasks fail due to timeouts (part-II). (smohanty)


Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/49dfd03c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/49dfd03c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/49dfd03c

Branch: refs/heads/trunk
Commit: 49dfd03c48115bb55d1db9cfb5dfff81572ec0cb
Parents: a3492ae
Author: Sumit Mohanty <smohanty@hortonworks.com>
Authored: Tue Jul 30 14:24:38 2013 -0700
Committer: Sumit Mohanty <smohanty@hortonworks.com>
Committed: Tue Jul 30 14:24:46 2013 -0700

----------------------------------------------------------------------
 ambari-agent/src/main/python/ambari_agent/PuppetExecutor.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/49dfd03c/ambari-agent/src/main/python/ambari_agent/PuppetExecutor.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/python/ambari_agent/PuppetExecutor.py b/ambari-agent/src/main/python/ambari_agent/PuppetExecutor.py
index ac26ec7..61390cd 100644
--- a/ambari-agent/src/main/python/ambari_agent/PuppetExecutor.py
+++ b/ambari-agent/src/main/python/ambari_agent/PuppetExecutor.py
@@ -171,7 +171,7 @@ class PuppetExecutor:
     logger.debug("Setting RUBYLIB as: " + rubyLib)
     logger.info("Running command " + pprint.pformat(puppetcommand))
     puppet = self.lauch_puppet_subprocess(puppetcommand, tmpout, tmperr, puppetEnv)
-    logger.info("Command started with PID: " + puppet.pid)
+    logger.info("Command started with PID: " + str(puppet.pid))
     logger.debug("Launching watchdog thread")
     self.event.clear()
     self.last_puppet_has_been_killed = False
@@ -223,7 +223,7 @@ class PuppetExecutor:
   def puppet_watchdog_func(self, puppet):
     self.event.wait(self.PUPPET_TIMEOUT_SECONDS)
     if puppet.returncode is None:
-      logger.error("Task timed out, killing process with PID: " + puppet.pid)
+      logger.error("Task timed out, killing process with PID: " + str(puppet.pid))
       shell.kill_process_with_children(puppet.pid)
       self.last_puppet_has_been_killed = True
     pass


Mime
View raw message