aurora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wfar...@apache.org
Subject git commit: Fix bad function call in thermos_task_runner.
Date Tue, 14 Oct 2014 22:59:26 GMT
Repository: incubator-aurora
Updated Branches:
  refs/heads/master f3f950abc -> 89e4313f1


Fix bad function call in thermos_task_runner.

Bugs closed: AURORA-836

Reviewed at https://reviews.apache.org/r/26711/


Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/89e4313f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/89e4313f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/89e4313f

Branch: refs/heads/master
Commit: 89e4313f1ba244551af4f877e6ffb71d23b6e590
Parents: f3f950a
Author: Bill Farner <wfarner@apache.org>
Authored: Tue Oct 14 15:59:05 2014 -0700
Committer: Bill Farner <wfarner@apache.org>
Committed: Tue Oct 14 15:59:05 2014 -0700

----------------------------------------------------------------------
 src/main/python/apache/aurora/executor/thermos_task_runner.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/89e4313f/src/main/python/apache/aurora/executor/thermos_task_runner.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/executor/thermos_task_runner.py b/src/main/python/apache/aurora/executor/thermos_task_runner.py
index 4e68844..f179108 100644
--- a/src/main/python/apache/aurora/executor/thermos_task_runner.py
+++ b/src/main/python/apache/aurora/executor/thermos_task_runner.py
@@ -299,9 +299,11 @@ class ThermosTaskRunner(TaskRunner):
 
       if not self.is_alive:
         if self._popen_rc != 0:
-          raise TaskError('Task failed: %s' % self._popen_reason())
+          raise TaskError('Task failed: %s' % self.compute_status().reason)
         else:
-          log.info('Task runner exited: %s' % self._popen_reason())
+          # We can end up here if the process exited between the call to Popen and
+          # waitpid (in is_alive), which is fine.
+          log.info('Task runner exited: %s' % self.compute_status().reason)
           break
 
     if not is_started():


Mime
View raw message