Repository: aurora Updated Branches: refs/heads/master b320a0776 -> 9a6832fea
Re-add Health Check to the Scheduler Bugs closed: AURORA-1496 Reviewed at https://reviews.apache.org/r/38504/ Project: http://git-wip-us.apache.org/repos/asf/aurora/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/9a6832fe Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/9a6832fe Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/9a6832fe Branch: refs/heads/master Commit: 9a6832fea1a6a18999e4b3ae2b345584b0e9d8f8 Parents: b320a07 Author: Joe Smith <[email protected]> Authored: Fri Sep 18 13:06:52 2015 -0700 Committer: Maxim Khutornenko <[email protected]> Committed: Fri Sep 18 13:06:52 2015 -0700 ---------------------------------------------------------------------- .../org/apache/aurora/scheduler/http/JettyServerModule.java | 1 + src/test/sh/org/apache/aurora/e2e/test_end_to_end.sh | 5 +++++ 2 files changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aurora/blob/9a6832fe/src/main/java/org/apache/aurora/scheduler/http/JettyServerModule.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/aurora/scheduler/http/JettyServerModule.java b/src/main/java/org/apache/aurora/scheduler/http/JettyServerModule.java index f9b0687..ee024a3 100644 --- a/src/main/java/org/apache/aurora/scheduler/http/JettyServerModule.java +++ b/src/main/java/org/apache/aurora/scheduler/http/JettyServerModule.java @@ -215,6 +215,7 @@ public class JettyServerModule extends AbstractModule { .put(AbortHandler.class, "abortabortabort") .put(ContentionPrinter.class, "contention") .put(Cron.class, "cron") + .put(HealthHandler.class, "health") .put(Locks.class, "locks") .put(LogConfig.class, "logconfig") .put(Maintenance.class, "maintenance") http://git-wip-us.apache.org/repos/asf/aurora/blob/9a6832fe/src/test/sh/org/apache/aurora/e2e/test_end_to_end.sh ---------------------------------------------------------------------- diff --git a/src/test/sh/org/apache/aurora/e2e/test_end_to_end.sh b/src/test/sh/org/apache/aurora/e2e/test_end_to_end.sh index 1eec20c..d7c61e2 100755 --- a/src/test/sh/org/apache/aurora/e2e/test_end_to_end.sh +++ b/src/test/sh/org/apache/aurora/e2e/test_end_to_end.sh @@ -61,6 +61,10 @@ test_version() { [[ $(aurora --version 2>&1) = $(cat /vagrant/.auroraversion) ]] } +test_health_check() { + [[ $(_curl "localhost:8081/health") == 'OK' ]] +} + test_config() { local _config=$1 _jobkey=$2 @@ -319,6 +323,7 @@ trap collect_result EXIT aurorabuild all test_version test_http_example "${TEST_JOB_ARGS[@]}" +test_health_check test_http_revocable_example "${TEST_JOB_REVOCABLE_ARGS[@]}"
