aurora git commit: Exposing DSL defined variables to shell health checkers

[jsirois]

Repository: aurora
Updated Branches:
  refs/heads/master d752d466c -> 7fc4bff7b


Exposing DSL defined variables to shell health checkers

Bugs closed: AURORA-1622

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


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

Branch: refs/heads/master
Commit: 7fc4bff7b7d738dd20f2556d35aa3967245bd931
Parents: d752d46
Author: Dmitriy Shirchenko 
Authored: Fri Mar 11 14:48:59 2016 -0700
Committer: John Sirois 
Committed: Fri Mar 11 14:48:59 2016 -0700

--
 .../apache/aurora/common/health_check/shell.py  |  2 +-
 .../aurora/executor/common/health_checker.py| 32 ++--
 .../aurora/common/health_check/test_shell.py| 12 +---
 .../executor/common/test_health_checker.py  | 32 +++-
 4 files changed, 70 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/aurora/blob/7fc4bff7/src/main/python/apache/aurora/common/health_check/shell.py
--
diff --git a/src/main/python/apache/aurora/common/health_check/shell.py 
b/src/main/python/apache/aurora/common/health_check/shell.py
index 890bf0c..bf63d93 100644
--- a/src/main/python/apache/aurora/common/health_check/shell.py
+++ b/src/main/python/apache/aurora/common/health_check/shell.py
@@ -47,7 +47,7 @@ class ShellHealthCheck(object):
 """
 cmd = shlex.split(self.cmd)
 try:
-  subprocess.check_call(cmd, timeout=self.timeout_secs)
+  subprocess.check_call(cmd, timeout=self.timeout_secs, shell=True)
   return True, None
 except subprocess.CalledProcessError as reason:
   # The command didn't return a 0 so provide reason for failure.

http://git-wip-us.apache.org/repos/asf/aurora/blob/7fc4bff7/src/main/python/apache/aurora/executor/common/health_checker.py
--
diff --git a/src/main/python/apache/aurora/executor/common/health_checker.py 
b/src/main/python/apache/aurora/executor/common/health_checker.py
index 3039727..28fd3ec 100644
--- a/src/main/python/apache/aurora/executor/common/health_checker.py
+++ b/src/main/python/apache/aurora/executor/common/health_checker.py
@@ -18,12 +18,15 @@ import time
 import traceback
 
 from mesos.interface.mesos_pb2 import TaskState
+from pystachio import Environment, String
 from twitter.common import log
 from twitter.common.exceptions import ExceptionalThread
 from twitter.common.metrics import LambdaGauge
 
 from apache.aurora.common.health_check.http_signaler import HttpSignaler
 from apache.aurora.common.health_check.shell import ShellHealthCheck
+from apache.aurora.config.schema.base import MesosContext
+from apache.thermos.config.schema import ThermosContext
 
 from .status_checker import StatusChecker, StatusCheckerProvider, StatusResult
 from .task_info import mesos_task_instance_from_assigned_task, resolve_ports
@@ -203,6 +206,25 @@ class HealthChecker(StatusChecker):
 
 
 class HealthCheckerProvider(StatusCheckerProvider):
+
+  @staticmethod
+  def interpolate_cmd(task, cmd):
+"""
+:param task: Assigned task passed from Mesos Agent
+:param cmd: Command defined inside shell_command inside config.
+:return: Interpolated cmd with filled in values, for example ports.
+"""
+thermos_namespace = ThermosContext(
+task_id=task.taskId,
+ports=task.assignedPorts)
+mesos_namespace = MesosContext(instance=task.instanceId)
+command = String(cmd) % Environment(
+thermos=thermos_namespace,
+mesos=mesos_namespace
+)
+
+return command.get()
+
   def from_assigned_task(self, assigned_task, sandbox):
 """
 :param assigned_task:
@@ -215,9 +237,15 @@ class HealthCheckerProvider(StatusCheckerProvider):
 timeout_secs = health_check_config.get('timeout_secs')
 if SHELL_HEALTH_CHECK in health_checker:
   shell_command = health_checker.get(SHELL_HEALTH_CHECK, 
{}).get('shell_command')
+  # Filling in variables eg thermos.ports[http] that could have been 
passed in as part of
+  # shell_command.
+  interpolated_command = HealthCheckerProvider.interpolate_cmd(
+task=assigned_task,
+cmd=shell_command
+  )
   shell_signaler = ShellHealthCheck(
-cmd=shell_command,
-timeout_secs=timeout_secs
+cmd=interpolated_command,
+timeout_secs=timeout_secs,
   )
   a_health_checker = lambda: shell_signaler()
 else:

http://git-wip-us.apache.org/repos/asf/aurora/blob/7fc4bff7/src/test/python/apache/aurora/common/health_check/test_shell.py

aurora git commit: Log exceptions raised when thermos running attempts to execute a process.

[jcohen]

Repository: aurora
Updated Branches:
  refs/heads/master 72bf8dbd2 -> d752d466c


Log exceptions raised when thermos running attempts to execute a process.

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


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

Branch: refs/heads/master
Commit: d752d466c550118f052d23519d071eb41b2e5bf6
Parents: 72bf8db
Author: Joshua Cohen 
Authored: Thu Mar 10 19:41:10 2016 -0600
Committer: Joshua Cohen 
Committed: Thu Mar 10 19:41:10 2016 -0600

--
 src/main/python/apache/thermos/core/process.py | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/aurora/blob/d752d466/src/main/python/apache/thermos/core/process.py
--
diff --git a/src/main/python/apache/thermos/core/process.py 
b/src/main/python/apache/thermos/core/process.py
index c343b2d..f147af7 100644
--- a/src/main/python/apache/thermos/core/process.py
+++ b/src/main/python/apache/thermos/core/process.py
@@ -285,6 +285,9 @@ class ProcessBase(object):
   self._wait_for_control()  # can raise CheckpointError
   try:
 self.execute()
+  except Exception as e:
+self._log('Error trying to execute %s: %s' % (self._name, e))
+raise e
   finally:
 self._ckpt.close()
 self.finish()