[airavata] branch develop updated: update server settings

[isjarana]

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

isjarana pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git


The following commit(s) were added to refs/heads/develop by this push:
     new 8dca9578cc update server settings
     new b9d880b6b5 Merge pull request #331 from isururanawaka/metaschedular
8dca9578cc is described below

commit 8dca9578cced64f6208abf74cc7ffe857a3cc56b
Author: Isuru Ranawaka <irjan...@gmail.com>
AuthorDate: Thu Nov 17 18:01:20 2022 -0500

    update server settings
---
 .../inventories/scigap/develop/group_vars/all/vars.yml       | 10 ++++++++++
 .../roles/api-orch/templates/airavata-server.properties.j2   | 12 ++++++++++++
 .../org/apache/airavata/common/utils/ServerSettings.java     | 12 ++++++------
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git 
a/dev-tools/ansible/inventories/scigap/develop/group_vars/all/vars.yml 
b/dev-tools/ansible/inventories/scigap/develop/group_vars/all/vars.yml
index f90e1c76e0..d9995b6df9 100644
--- a/dev-tools/ansible/inventories/scigap/develop/group_vars/all/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/group_vars/all/vars.yml
@@ -235,3 +235,13 @@ monitoring_subnets: "{{ iu_subnets }}"
 
 # Zabbix
 zabbix_server: "rt-watch.uits.indiana.edu"
+
+
+#variables for metscheduler
+cluster_monitoring_enabled: false
+metascheduler_resource_selection_policy_class: 
org.apache.airavata.metascheduler.process.scheduling.cr.DefaultComputeResourceSelectionPolicy
+metascheduler_gateway: seagrid
+metascheduler_group_resource_profile: a2076a5a-0fbf-44f4-9d47-060153bc578b
+metascheduler_username: metascheacc
+cluster_scanning_interval: 1800000
+cluster_scanning_parallel_jobs: 1
\ No newline at end of file
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 4f1af00cf6..72d56dac61 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
@@ -338,3 +338,15 @@ thrift.client.pool.abandoned.removal.logged={{ 
thrift_client_pool_abandoned_remo
 api.server.monitoring.enabled={{ api_server_monitoring_enabled }}
 api.server.monitoring.host={{ api_server_monitoring_host }}
 api.server.monitoring.port={{ api_server_monitoring_port }}
+
+
+###########################################################################
+# Metascheduler And Compute Resource Monitoring Configuration
+###########################################################################
+cluster.status.monitoring.enable={{ cluster_monitoring_enabled }}
+compute.resource.selection.policy.class={{ 
metascheduler_resource_selection_policy_class }}
+metascheduler.gateway={{ metascheduler_gateway }}
+metascheduler.group.resource.profile={{ metascheduler_group_resource_profile }}
+metascheduler.username={{ metascheduler_username }}
+cluster.scanning.interval={{ cluster_scanning_interval }}
+cluster.scanning.parallel.jobs={{ cluster_scanning_parallel_jobs }}
diff --git 
a/modules/commons/src/main/java/org/apache/airavata/common/utils/ServerSettings.java
 
b/modules/commons/src/main/java/org/apache/airavata/common/utils/ServerSettings.java
index 31b734c031..df24febc3b 100644
--- 
a/modules/commons/src/main/java/org/apache/airavata/common/utils/ServerSettings.java
+++ 
b/modules/commons/src/main/java/org/apache/airavata/common/utils/ServerSettings.java
@@ -148,8 +148,8 @@ public class ServerSettings extends ApplicationSettings {
     public static final String METASCHEDULER_GATEWAY = "metascheduler.gateway";
     public static final String METASCHEDULER_GRP_ID = 
"metascheduler.group.resource.profile";
     public static final String METASCHEDULER_USERNAME = 
"metascheduler.username";
-    public static final String METASCHEDULER_SCANNING_INTERVAL = 
"metascheduler.scanning.interval";
-    public static final String METASCHEDULER_NO_OF_SCANNING_PARALLEL_JOBS = 
"metascheduler.no.of.scanning.parallel.jobs";
+    public static final String METASCHEDULER_SCANNING_INTERVAL = 
"cluster.scanning.interval";
+    public static final String METASCHEDULER_NO_OF_SCANNING_PARALLEL_JOBS = 
"cluster.scanning.parallel.jobs";
 
 
 
@@ -526,13 +526,13 @@ public class ServerSettings extends ApplicationSettings {
     }
 
     public static double getMetaschedulerScanningInterval() throws 
ApplicationSettingsException {
-        return Double.parseDouble(getSetting(METASCHEDULER_GRP_ID,
-                ""));
+        return Double.parseDouble(getSetting(METASCHEDULER_SCANNING_INTERVAL,
+                "1800000"));
     }
 
     public static int getMetaschedulerNoOfScanningParallelJobs() throws 
ApplicationSettingsException {
-        return Integer.parseInt(getSetting(METASCHEDULER_GRP_ID,
-                ""));
+        return 
Integer.parseInt(getSetting(METASCHEDULER_NO_OF_SCANNING_PARALLEL_JOBS,
+                "1"));
     }