Add a configuration parameter for setting escalation wait times per-task.

Author: GeorgeSirois

src/main/python/apache/aurora/executor/thermos_task_runner.py

@@ -50,7 +50,6 @@
 
 
 class ThermosTaskRunner(TaskRunner):
-  ESCALATION_WAIT = Amount(5, Time.SECONDS)
   EXIT_STATE_MAP = {
       TaskState.ACTIVE: StatusResult('Runner died while task was active.', mesos_pb2.TASK_LOST),
       TaskState.FAILED: StatusResult('Task failed.', mesos_pb2.TASK_FAILED),
@@ -113,6 +112,10 @@ def __init__(self,
     except ThermosTaskWrapper.InvalidTask as e:
       raise TaskError('Failed to load task: %s' % e)
 
+    # Only attempt to extract information after task validation.
+    self._escalation_wait = Amount(
+        self._task.escalation_wait().get(), Time.SECONDS)
+
   def _terminate_http(self):
     if 'health' not in self._ports:
       return
@@ -121,13 +124,13 @@ def _terminate_http(self):
 
     # pass 1
     http_signaler.quitquitquit()
-    self._clock.sleep(self.ESCALATION_WAIT.as_(Time.SECONDS))
+    self._clock.sleep(self._escalation_wait.as_(Time.SECONDS))
     if self.status is not None:
       return True
 
     # pass 2
     http_signaler.abortabortabort()
-    self._clock.sleep(self.ESCALATION_WAIT.as_(Time.SECONDS))
+    self._clock.sleep(self._escalation_wait.as_(Time.SECONDS))
     if self.status is not None:
       return True
 

src/main/python/apache/thermos/config/schema_base.py

@@ -74,6 +74,8 @@ class Task(Struct):
                                             # > 0 is max concurrent processes.
   finalization_wait = Default(Integer, 30)  # the amount of time in seconds we allocate to run the
                                             # finalization schedule.
+  escalation_wait = Default(Integer, 5)     # The amount of time in seconds to wait after running
+                                            # the /quitquitquit and /abortabortabort handlers.
 
   # TODO(jon): remove/replace with proper solution to MESOS-3546
   user = String