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 5D712200C69 for ; Sat, 22 Apr 2017 03:39:04 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 5C0F7160BAF; Sat, 22 Apr 2017 01:39:04 +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 7A103160B97 for ; Sat, 22 Apr 2017 03:39:03 +0200 (CEST) Received: (qmail 89510 invoked by uid 500); 22 Apr 2017 01:39:02 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 89501 invoked by uid 99); 22 Apr 2017 01:39:02 -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; Sat, 22 Apr 2017 01:39:02 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 68B36F49F1; Sat, 22 Apr 2017 01:39:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: scnakandala@apache.org To: commits@airavata.apache.org Message-Id: <157b8e71f77c46169bc656da7603d881@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: airavata git commit: adding configurable cluster status monitoring option Date: Sat, 22 Apr 2017 01:39:02 +0000 (UTC) archived-at: Sat, 22 Apr 2017 01:39:04 -0000 Repository: airavata Updated Branches: refs/heads/develop 803d5ea89 -> 2923dd276 adding configurable cluster status monitoring option Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/2923dd27 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/2923dd27 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/2923dd27 Branch: refs/heads/develop Commit: 2923dd2769aa0e24a99299ab98476905d6d4505e Parents: 803d5ea Author: scnakandala Authored: Fri Apr 21 21:38:55 2017 -0400 Committer: scnakandala Committed: Fri Apr 21 21:38:55 2017 -0400 ---------------------------------------------------------------------- .../roles/api-orch/templates/airavata-server.properties.j2 | 1 + .../roles/gfac/templates/airavata-server.properties.j2 | 7 +++++++ .../roles/registry/templates/airavata-server.properties.j2 | 7 +++++++ .../org/apache/airavata/common/utils/ApplicationSettings.java | 4 ++++ .../server/src/main/resources/airavata-server.properties | 1 + .../airavata/orchestrator/server/OrchestratorServer.java | 7 +++++-- .../src/main/resources/airavata-server.properties | 1 + 7 files changed, 26 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/2923dd27/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2 ---------------------------------------------------------------------- diff --git a/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2 b/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2 index 2cd5013..e502524 100644 --- a/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2 +++ b/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2 @@ -54,6 +54,7 @@ super.tenant.gatewayId={{ default_gateway }} # Properties for cluster status monitoring # cluster status monitoring job repeat time in seconds +cluster.status.monitoring.enable=false cluster.status.monitoring.repeat.time=18000 ########################################################################### http://git-wip-us.apache.org/repos/asf/airavata/blob/2923dd27/dev-tools/ansible/roles/gfac/templates/airavata-server.properties.j2 ---------------------------------------------------------------------- diff --git a/dev-tools/ansible/roles/gfac/templates/airavata-server.properties.j2 b/dev-tools/ansible/roles/gfac/templates/airavata-server.properties.j2 index bf6f536..8aef970 100644 --- a/dev-tools/ansible/roles/gfac/templates/airavata-server.properties.j2 +++ b/dev-tools/ansible/roles/gfac/templates/airavata-server.properties.j2 @@ -50,6 +50,13 @@ default.registry.user=admin default.registry.password=admin default.registry.password.hash.method=SHA default.registry.gateway={{ default_gateway }} +super.tenant.gatewayId={{ default_gateway }} + +# Properties for cluster status monitoring +# cluster status monitoring job repeat time in seconds +cluster.status.monitoring.enable=false +cluster.status.monitoring.repeat.time=18000 + ########################################################################### # Application Catalog DB Configuration http://git-wip-us.apache.org/repos/asf/airavata/blob/2923dd27/dev-tools/ansible/roles/registry/templates/airavata-server.properties.j2 ---------------------------------------------------------------------- diff --git a/dev-tools/ansible/roles/registry/templates/airavata-server.properties.j2 b/dev-tools/ansible/roles/registry/templates/airavata-server.properties.j2 index bf92e39..4bf7e23 100644 --- a/dev-tools/ansible/roles/registry/templates/airavata-server.properties.j2 +++ b/dev-tools/ansible/roles/registry/templates/airavata-server.properties.j2 @@ -50,6 +50,13 @@ default.registry.user=admin default.registry.password=admin default.registry.password.hash.method=SHA default.registry.gateway={{ default_gateway }} +super.tenant.gatewayId={{ default_gateway }} + +# Properties for cluster status monitoring +# cluster status monitoring job repeat time in seconds +cluster.status.monitoring.enable=false +cluster.status.monitoring.repeat.time=18000 + ########################################################################### # Application Catalog DB Configuration http://git-wip-us.apache.org/repos/asf/airavata/blob/2923dd27/modules/commons/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java ---------------------------------------------------------------------- diff --git a/modules/commons/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java b/modules/commons/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java index 085bcfb..5c438f3 100644 --- a/modules/commons/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java +++ b/modules/commons/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java @@ -413,6 +413,10 @@ public class ApplicationSettings { return getSetting("cluster.status.monitoring.repeat.time"); } + public static Boolean enableClusterStatusMonitoring() throws ApplicationSettingsException { + return getSetting("cluster.status.monitoring.enable").equalsIgnoreCase("true"); + } + public static String getUserProfileServerHost() throws ApplicationSettingsException { return getSetting(ServerSettings.USER_PROFILE_SERVER_HOST); } http://git-wip-us.apache.org/repos/asf/airavata/blob/2923dd27/modules/configuration/server/src/main/resources/airavata-server.properties ---------------------------------------------------------------------- diff --git a/modules/configuration/server/src/main/resources/airavata-server.properties b/modules/configuration/server/src/main/resources/airavata-server.properties index 2f2d5df..e7ee862 100644 --- a/modules/configuration/server/src/main/resources/airavata-server.properties +++ b/modules/configuration/server/src/main/resources/airavata-server.properties @@ -54,6 +54,7 @@ super.tenant.gatewayId=php_reference_gateway # Properties for cluster status monitoring # cluster status monitoring job repeat time in seconds +cluster.status.monitoring.enable=false cluster.status.monitoring.repeat.time=18000 ########################################################################### http://git-wip-us.apache.org/repos/asf/airavata/blob/2923dd27/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServer.java ---------------------------------------------------------------------- diff --git a/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServer.java b/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServer.java index f025e67..2b33477 100644 --- a/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServer.java +++ b/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServer.java @@ -115,8 +115,11 @@ public class OrchestratorServer implements IServer { @Override public void start() throws Exception { - //starting cluster status monitoring - startClusterStatusMonitoring(); + if (ServerSettings.enableClusterStatusMonitoring()) { + //starting cluster status monitoring + startClusterStatusMonitoring(); + } + setStatus(ServerStatus.STARTING); OrchestratorService.Processor orchestratorService = http://git-wip-us.apache.org/repos/asf/airavata/blob/2923dd27/modules/test-suite/multi-tenanted-airavata/src/main/resources/airavata-server.properties ---------------------------------------------------------------------- diff --git a/modules/test-suite/multi-tenanted-airavata/src/main/resources/airavata-server.properties b/modules/test-suite/multi-tenanted-airavata/src/main/resources/airavata-server.properties index 0b15ef7..77bbd46 100644 --- a/modules/test-suite/multi-tenanted-airavata/src/main/resources/airavata-server.properties +++ b/modules/test-suite/multi-tenanted-airavata/src/main/resources/airavata-server.properties @@ -54,6 +54,7 @@ super.tenant.gatewayId=php_reference_gateway # Properties for cluster status monitoring # cluster status monitoring job repeat time in seconds +cluster.status.monitoring.enable=false cluster.status.monitoring.repeat.time=18000 ###########################################################################