[incubator-heron] branch master updated: Support lifecycle for aurora (#3581)

[hu...@apache.org]

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

huijun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git


The following commit(s) were added to refs/heads/master by this push:
     new 8f78034  Support lifecycle for aurora (#3581)
8f78034 is described below

commit 8f78034f4b7b117323e287e231cdb84ec1f18cf2
Author: choi se <th...@gmail.com>
AuthorDate: Sun Jul 26 13:24:57 2020 +0900

    Support lifecycle for aurora (#3581)
    
    Co-authored-by: thinker0 <th...@linecorp.com>
---
 heron/config/src/yaml/conf/aurora/heron.aurora | 2 +-
 heron/shell/src/python/main.py                 | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/heron/config/src/yaml/conf/aurora/heron.aurora b/heron/config/src/yaml/conf/aurora/heron.aurora
index d32c83b..d939fa8 100644
--- a/heron/config/src/yaml/conf/aurora/heron.aurora
+++ b/heron/config/src/yaml/conf/aurora/heron.aurora
@@ -79,7 +79,7 @@ jobs = [
     service = True,
     task = heron_task,
     instances = '{{NUM_CONTAINERS}}',
-    announce = Announcer(primary_port = 'http', portmap = {'health': 'http'}),
+    announce = Announcer(primary_port = 'http', portmap = {'admin': 'http', 'health': 'http'}),
     health_check_config = HealthCheckConfig(
       health_checker = HealthCheckerConfig(
         http = HttpHealthChecker(endpoint='/health', expected_response='ok', expected_response_code=200)
diff --git a/heron/shell/src/python/main.py b/heron/shell/src/python/main.py
index c476eca..9705e7c 100644
--- a/heron/shell/src/python/main.py
+++ b/heron/shell/src/python/main.py
@@ -41,6 +41,8 @@ default_handlers = [
     (r"^/filestats/(.*)", handlers.FileStatsHandler),
     (r"^/download/(.*)", handlers.DownloadHandler),
     (r"^/killexecutor", handlers.KillExecutorHandler),
+    (r"^/quitquitquit", handlers.KillExecutorHandler),
+    (r"^/abortabortabort", handlers.KillExecutorHandler),
     (r"^/health", handlers.HealthHandler),
 ]