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/e3009f5f Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/e3009f5f Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/e3009f5f Branch: refs/heads/develop Commit: e3009f5f3e010a0859625328a321dc56301afac4 Parents: eadbdba Author: scnakandala <[email protected]> Authored: Fri Apr 21 21:38:55 2017 -0400 Committer: scnakandala <[email protected]> Committed: Fri Apr 21 22:05:58 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/e3009f5f/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/e3009f5f/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/e3009f5f/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/e3009f5f/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 acd037a..820b282 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 @@ -411,6 +411,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/e3009f5f/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 fd1449f..b11107f 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/e3009f5f/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 dd7f24a..cb4f468 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 @@ -113,8 +113,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<OrchestratorServerHandler> orchestratorService = http://git-wip-us.apache.org/repos/asf/airavata/blob/e3009f5f/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 e8a5b25..e2b0d51 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 ###########################################################################
