Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 3CF822007D0 for ; Tue, 10 May 2016 08:29:10 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 3B910160877; Tue, 10 May 2016 06:29:10 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 84E001607AA for ; Tue, 10 May 2016 08:29:09 +0200 (CEST) Received: (qmail 28531 invoked by uid 500); 10 May 2016 06:29:08 -0000 Mailing-List: contact commits-help@eagle.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@eagle.incubator.apache.org Delivered-To: mailing list commits@eagle.incubator.apache.org Received: (qmail 28522 invoked by uid 99); 10 May 2016 06:29:08 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 May 2016 06:29:08 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 089E81A457E for ; Tue, 10 May 2016 06:29:08 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.221 X-Spam-Level: X-Spam-Status: No, score=-3.221 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id 8sBQsg2zO1Sx for ; Tue, 10 May 2016 06:29:06 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id C1D435F486 for ; Tue, 10 May 2016 06:29:05 +0000 (UTC) Received: (qmail 28350 invoked by uid 99); 10 May 2016 06:29:04 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 May 2016 06:29:04 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C2276DFC7E; Tue, 10 May 2016 06:29:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: qingwzhao@apache.org To: commits@eagle.incubator.apache.org Date: Tue, 10 May 2016 06:29:04 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/3] incubator-eagle git commit: Add configuration value to enable application Manager archived-at: Tue, 10 May 2016 06:29:10 -0000 Repository: incubator-eagle Updated Branches: refs/heads/dev d8be43f1f -> 8087ec0b6 Add configuration value to enable application Manager Project: http://git-wip-us.apache.org/repos/asf/incubator-eagle/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-eagle/commit/02fcb79d Tree: http://git-wip-us.apache.org/repos/asf/incubator-eagle/tree/02fcb79d Diff: http://git-wip-us.apache.org/repos/asf/incubator-eagle/diff/02fcb79d Branch: refs/heads/dev Commit: 02fcb79d7dcb959338547bec280cff1991b33cdb Parents: d8be43f Author: Zhao, Qingwen Authored: Fri May 6 11:21:48 2016 +0800 Committer: Zhao, Qingwen Committed: Fri May 6 11:21:48 2016 +0800 ---------------------------------------------------------------------- eagle-assembly/src/main/conf/eagle-scheduler.conf | 1 + .../eagle/service/application/AppManagerConstants.java | 1 + .../security/profile/ApplicationSchedulerListener.java | 8 ++++++-- eagle-webservice/src/main/resources/eagle-scheduler.conf | 1 + 4 files changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/02fcb79d/eagle-assembly/src/main/conf/eagle-scheduler.conf ---------------------------------------------------------------------- diff --git a/eagle-assembly/src/main/conf/eagle-scheduler.conf b/eagle-assembly/src/main/conf/eagle-scheduler.conf index aaab131..74ff18b 100644 --- a/eagle-assembly/src/main/conf/eagle-scheduler.conf +++ b/eagle-assembly/src/main/conf/eagle-scheduler.conf @@ -15,6 +15,7 @@ ### scheduler propertise +appCommandLoaderEnabled = false appCommandLoaderIntervalSecs = 1 appHealthCheckIntervalSecs = 5 http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/02fcb79d/eagle-core/eagle-application-management/eagle-application-service/src/main/java/org/apache/eagle/service/application/AppManagerConstants.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-application-management/eagle-application-service/src/main/java/org/apache/eagle/service/application/AppManagerConstants.java b/eagle-core/eagle-application-management/eagle-application-service/src/main/java/org/apache/eagle/service/application/AppManagerConstants.java index dafd7fb..3aa3579 100644 --- a/eagle-core/eagle-application-management/eagle-application-service/src/main/java/org/apache/eagle/service/application/AppManagerConstants.java +++ b/eagle-core/eagle-application-management/eagle-application-service/src/main/java/org/apache/eagle/service/application/AppManagerConstants.java @@ -36,6 +36,7 @@ public class AppManagerConstants { public final static String EAGLE_CLUSTER_STORM = "storm"; public final static String EAGLE_CLUSTER_SPARK = "spark"; + public final static String APP_COMMAND_LOADER_ENABLED = "appCommandLoaderEnabled"; public final static String APP_COMMAND_LOADER_INTERVAL_SECS = "appCommandLoaderIntervalSecs"; public final static String APP_HEALTH_CHECK_INTERVAL_SECS = "appHealthCheckIntervalSecs"; http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/02fcb79d/eagle-webservice/src/main/java/org/apache/eagle/service/security/profile/ApplicationSchedulerListener.java ---------------------------------------------------------------------- diff --git a/eagle-webservice/src/main/java/org/apache/eagle/service/security/profile/ApplicationSchedulerListener.java b/eagle-webservice/src/main/java/org/apache/eagle/service/security/profile/ApplicationSchedulerListener.java index a225192..3ef9756 100644 --- a/eagle-webservice/src/main/java/org/apache/eagle/service/security/profile/ApplicationSchedulerListener.java +++ b/eagle-webservice/src/main/java/org/apache/eagle/service/security/profile/ApplicationSchedulerListener.java @@ -22,7 +22,9 @@ package org.apache.eagle.service.security.profile; import akka.actor.ActorSystem; import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; +import org.apache.eagle.service.application.AppManagerConstants; import org.apache.eagle.stream.application.scheduler.ApplicationScheduler; +import org.apache.hadoop.yarn.api.ApplicationConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import scala.concurrent.duration.Duration; @@ -42,7 +44,9 @@ public class ApplicationSchedulerListener implements ServletContextListener { //Get the actor system from the spring context //SpringBeanAutowiringSupport.processInjectionBasedOnCurrentContext(this); Config config = ConfigFactory.load("eagle-scheduler.conf"); - system = new ApplicationScheduler().start(config); + if(config.hasPath(AppManagerConstants.APP_COMMAND_LOADER_ENABLED) && config.getBoolean(AppManagerConstants.APP_COMMAND_LOADER_ENABLED)) { + system = new ApplicationScheduler().start(config); + } } @Override @@ -52,7 +56,7 @@ public class ApplicationSchedulerListener implements ServletContextListener { system.shutdown(); system.awaitTermination(Duration.create(15, TimeUnit.SECONDS)); } else { - LOG.warn("No actor system loaded, yet trying to shut down. Check AppContext config and consider if you need this listener."); + LOG.warn("No actor system loaded, yet trying to shut down. Check eagle-scheduler.conf and consider if you need this listener."); } } http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/02fcb79d/eagle-webservice/src/main/resources/eagle-scheduler.conf ---------------------------------------------------------------------- diff --git a/eagle-webservice/src/main/resources/eagle-scheduler.conf b/eagle-webservice/src/main/resources/eagle-scheduler.conf index aaab131..74ff18b 100644 --- a/eagle-webservice/src/main/resources/eagle-scheduler.conf +++ b/eagle-webservice/src/main/resources/eagle-scheduler.conf @@ -15,6 +15,7 @@ ### scheduler propertise +appCommandLoaderEnabled = false appCommandLoaderIntervalSecs = 1 appHealthCheckIntervalSecs = 5