This is an automated email from the ASF dual-hosted git repository.
yasith pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/master by this push:
new ada1658be8 fix settings name issues
ada1658be8 is described below
commit ada1658be8f24e6f59784bb241126907a39f0610
Author: yasithdev <[email protected]>
AuthorDate: Mon Jul 14 04:16:06 2025 -0500
fix settings name issues
---
.devcontainer/docker-compose-alt.yml | 12 ++--
.../core/OrchestratorConfiguration.java | 72 ----------------------
.../core/utils/OrchestratorConstants.java | 4 --
.../orchestrator/core/utils/OrchestratorUtils.java | 10 +--
.../org/apache/airavata/server/ServerMain.java | 8 +--
.../service/profile/commons/utils/JPAUtils.java | 2 +-
.../src/main/resources/airavata-server.properties | 14 ++---
.../src/test/resources/orchestrator.properties | 5 --
.../templates/airavata-server.properties.j2 | 12 ++--
.../templates/airavata-server.properties.j2 | 8 +--
10 files changed, 20 insertions(+), 127 deletions(-)
diff --git a/.devcontainer/docker-compose-alt.yml
b/.devcontainer/docker-compose-alt.yml
index a6397b9e8f..b105917d60 100644
--- a/.devcontainer/docker-compose-alt.yml
+++ b/.devcontainer/docker-compose-alt.yml
@@ -94,7 +94,7 @@ services:
- sharing.tls.enabled=false
- userprofile.mongodb.host=localhost
- userprofile.mongodb.port=27017
- - apiserver=org.apache.airavata.api.server.AiravataAPIServer
+ - apiserver.class=org.apache.airavata.api.server.AiravataAPIServer
- apiserver.name=apiserver-node0
- apiserver.host=0.0.0.0
- apiserver.port=8930
@@ -105,10 +105,6 @@ services:
- orchestrator.server.port=8940
- orchestrator.server.min.threads=50
-
job.validators=org.apache.airavata.orchestrator.core.validator.impl.BatchQueueValidator,org.apache.airavata.orchestrator.core.validator.impl.ExperimentStatusValidator
- - submitter.interval=10000
- - threadpool.size=10
- - start.submitter=true
- - embedded.mode=true
- enable.validation=true
-
host.scheduler=org.apache.airavata.orchestrator.core.schedule.DefaultHostScheduler
- regserver=org.apache.airavata.registry.api.service.RegistryAPIServer
@@ -130,7 +126,7 @@ services:
- credential.store.jdbc.driver=org.mariadb.jdbc.Driver
- credential.store.server.host=0.0.0.0
- credential.store.server.port=8960
- -
credentialstore=org.apache.airavata.credential.store.server.CredentialStoreServer
+ -
credential.store.class=org.apache.airavata.credential.store.server.CredentialStoreServer
- credential.store.jdbc.validationQuery=SELECT 1 from CONFIGURATION
- rabbitmq.broker.url=amqp://guest:guest@rabbitmq:5672/develop
- rabbitmq.status.exchange.name=status_exchange
@@ -155,7 +151,7 @@ services:
- in.memory.cache.size=1000
- profile.service.server.host=0.0.0.0
- profile.service.server.port=8962
- -
profile_service=org.apache.airavata.service.profile.server.ProfileServiceServer
+ -
profile_service.class=org.apache.airavata.service.profile.server.ProfileServiceServer
- profile.service.jdbc.url=jdbc:mariadb://db:3306/profile_service
- profile.service.jdbc.user=root
- profile.service.jdbc.password=123456
@@ -164,7 +160,7 @@ services:
- iam.server.url=https://airavata.host:8443
- iam.server.super.admin.username=admin
- iam.server.super.admin.password=admin
- -
db_event_manager=org.apache.airavata.db.event.manager.DBEventManagerRunner
+ -
db_event_manager.class=org.apache.airavata.db.event.manager.DBEventManagerRunner
- thrift.client.pool.abandoned.removal.enabled=true
command: ["/tmp/wait-for-it.sh", "db:3306", "--", "/tmp/wait-for-it.sh",
"rabbitmq:5672", "--" ,
"/opt/apache-airavata-api-server/bin/airavata-server-start.sh", "api-orch"]
diff --git
a/airavata-api/src/main/java/org/apache/airavata/orchestrator/core/OrchestratorConfiguration.java
b/airavata-api/src/main/java/org/apache/airavata/orchestrator/core/OrchestratorConfiguration.java
index a443bfe153..750576266f 100644
---
a/airavata-api/src/main/java/org/apache/airavata/orchestrator/core/OrchestratorConfiguration.java
+++
b/airavata-api/src/main/java/org/apache/airavata/orchestrator/core/OrchestratorConfiguration.java
@@ -19,7 +19,6 @@
*/
package org.apache.airavata.orchestrator.core;
-import java.net.URL;
import java.util.List;
/**
@@ -28,22 +27,7 @@ import java.util.List;
*/
public class OrchestratorConfiguration {
- private String newJobSubmitterClass;
-
- private String hangedJobSubmitterClass;
-
- private int submitterInterval = 1000;
-
- private int threadPoolSize = 10;
-
- private boolean startSubmitter = false;
-
- private URL brokerURL;
-
- private boolean embeddedMode;
-
private List<String> validatorClasses;
-
private boolean enableValidation;
public List<String> getValidatorClasses() {
@@ -54,62 +38,6 @@ public class OrchestratorConfiguration {
this.validatorClasses = validatorClasses;
}
- public boolean isEmbeddedMode() {
- return embeddedMode;
- }
-
- public void setEmbeddedMode(boolean embeddedMode) {
- this.embeddedMode = embeddedMode;
- }
-
- public URL getBrokerURL() {
- return brokerURL;
- }
-
- public void setBrokerURL(URL brokerURL) {
- this.brokerURL = brokerURL;
- }
-
- public String getNewJobSubmitterClass() {
- return newJobSubmitterClass;
- }
-
- public int getSubmitterInterval() {
- return submitterInterval;
- }
-
- public int getThreadPoolSize() {
- return threadPoolSize;
- }
-
- public void setNewJobSubmitterClass(String newJobSubmitterClass) {
- this.newJobSubmitterClass = newJobSubmitterClass;
- }
-
- public void setSubmitterInterval(int submitterInterval) {
- this.submitterInterval = submitterInterval;
- }
-
- public void setThreadPoolSize(int threadPoolSize) {
- this.threadPoolSize = threadPoolSize;
- }
-
- public boolean isStartSubmitter() {
- return startSubmitter;
- }
-
- public void setStartSubmitter(boolean startSubmitter) {
- this.startSubmitter = startSubmitter;
- }
-
- public String getHangedJobSubmitterClass() {
- return hangedJobSubmitterClass;
- }
-
- public void setHangedJobSubmitterClass(String hangedJobSubmitterClass) {
- this.hangedJobSubmitterClass = hangedJobSubmitterClass;
- }
-
public boolean isEnableValidation() {
return enableValidation;
}
diff --git
a/airavata-api/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorConstants.java
b/airavata-api/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorConstants.java
index 4e3a656f62..8bbd0d9066 100644
---
a/airavata-api/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorConstants.java
+++
b/airavata-api/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorConstants.java
@@ -24,10 +24,6 @@ package org.apache.airavata.orchestrator.core.utils;
*
*/
public class OrchestratorConstants {
- public static final String SUBMIT_INTERVAL = "submitter.interval";
- public static final String THREAD_POOL_SIZE = "threadpool.size";
- public static final String START_SUBMITTER = "start.submitter";
- public static final String EMBEDDED_MODE = "embedded.mode";
public static final String ENABLE_VALIDATION = "enable.validation";
public static final String JOB_VALIDATOR = "job.validators";
diff --git
a/airavata-api/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorUtils.java
b/airavata-api/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorUtils.java
index ebaf426177..bfcd461553 100644
---
a/airavata-api/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorUtils.java
+++
b/airavata-api/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorUtils.java
@@ -67,16 +67,8 @@ public class OrchestratorUtils {
throws OrchestratorException, IOException, NumberFormatException,
ApplicationSettingsException {
OrchestratorConfiguration orchestratorConfiguration = new
OrchestratorConfiguration();
- orchestratorConfiguration.setSubmitterInterval(
-
Integer.parseInt(ServerSettings.getSetting(OrchestratorConstants.SUBMIT_INTERVAL)));
- orchestratorConfiguration.setThreadPoolSize(
-
Integer.parseInt(ServerSettings.getSetting(OrchestratorConstants.THREAD_POOL_SIZE)));
- orchestratorConfiguration.setStartSubmitter(
-
Boolean.valueOf(ServerSettings.getSetting(OrchestratorConstants.START_SUBMITTER)));
- orchestratorConfiguration.setEmbeddedMode(
-
Boolean.valueOf(ServerSettings.getSetting(OrchestratorConstants.EMBEDDED_MODE)));
orchestratorConfiguration.setEnableValidation(
-
Boolean.valueOf(ServerSettings.getSetting(OrchestratorConstants.ENABLE_VALIDATION)));
+
Boolean.parseBoolean(ServerSettings.getSetting(OrchestratorConstants.ENABLE_VALIDATION)));
if (orchestratorConfiguration.isEnableValidation()) {
orchestratorConfiguration.setValidatorClasses(
Arrays.asList(ServerSettings.getSetting(OrchestratorConstants.JOB_VALIDATOR)
diff --git
a/airavata-api/src/main/java/org/apache/airavata/server/ServerMain.java
b/airavata-api/src/main/java/org/apache/airavata/server/ServerMain.java
index 4c8086a112..701d5e4dd6 100644
--- a/airavata-api/src/main/java/org/apache/airavata/server/ServerMain.java
+++ b/airavata-api/src/main/java/org/apache/airavata/server/ServerMain.java
@@ -53,14 +53,14 @@ public class ServerMain {
private static final String API_ORCH = "api-orch";
private static final String EXECUTION = "execution";
// server names
- private static final String API_SERVER = "apiserver";
- private static final String CREDENTIAL_STORE = "credentialstore";
+ private static final String API_SERVER = "apiserver.class";
+ private static final String CREDENTIAL_STORE = "credential.store.class";
private static final String REGISTRY_SERVER = "regserver";
private static final String SHARING_SERVER = "sharing_server";
private static final String GFAC_SERVER = "gfac";
private static final String ORCHESTRATOR = "orchestrator";
- private static final String PROFILE_SERVICE = "profile_service";
- private static final String DB_EVENT_MANAGER = "db_event_manager";
+ private static final String PROFILE_SERVICE = "profile_service.class";
+ private static final String DB_EVENT_MANAGER = "db_event_manager.class";
private static ServerCnxnFactory cnxnFactory;
// private static boolean shutdownHookCalledBefore=false;
diff --git
a/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/utils/JPAUtils.java
b/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/utils/JPAUtils.java
index a340b5f5e1..b5541590cd 100644
---
a/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/utils/JPAUtils.java
+++
b/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/utils/JPAUtils.java
@@ -24,7 +24,7 @@ import jakarta.persistence.EntityManagerFactory;
import org.apache.airavata.common.utils.JDBCConfig;
public class JPAUtils {
- private static final String PERSISTENCE_UNIT_NAME = "profile_service";
+ private static final String PERSISTENCE_UNIT_NAME =
"profile_service.class";
private static final JDBCConfig JDBC_CONFIG = new
ProfileServiceJDBCConfig();
private static final EntityManagerFactory factory =
org.apache.airavata.common.utils.JPAUtils.getEntityManagerFactory(PERSISTENCE_UNIT_NAME,
JDBC_CONFIG);
diff --git a/airavata-api/src/main/resources/airavata-server.properties
b/airavata-api/src/main/resources/airavata-server.properties
index b37e0db8d4..abe4425f36 100644
--- a/airavata-api/src/main/resources/airavata-server.properties
+++ b/airavata-api/src/main/resources/airavata-server.properties
@@ -25,7 +25,7 @@ api.server.monitoring.port=9097
apiserver.host=0.0.0.0
apiserver.name=apiserver-node0
apiserver.port=8930
-apiserver=org.apache.airavata.api.server.AiravataAPIServer
+apiserver.class=org.apache.airavata.api.server.AiravataAPIServer
appcatalog.jdbc.driver=org.mariadb.jdbc.Driver
appcatalog.jdbc.password=123456
@@ -43,12 +43,12 @@ credential.store.jdbc.user=airavata
credential.store.jdbc.validationQuery=SELECT 1 from CONFIGURATION
credential.store.server.host=0.0.0.0
credential.store.server.port=8960
-credentialstore=org.apache.airavata.credential.store.server.CredentialStoreServer
+credential.store.class=org.apache.airavata.credential.store.server.CredentialStoreServer
data.analyzer.job.scanning.enable=false
data.parser.delete.container=true
-db_event_manager=org.apache.airavata.db.event.manager.DBEventManagerRunner
+db_event_manager.class=org.apache.airavata.db.event.manager.DBEventManagerRunner
default.registry.gateway=default
default.registry.oauth.client.id=pga
@@ -64,7 +64,6 @@ email.based.monitor.store.protocol=imaps
email.based.monitoring.period=10000
email.expiration.minutes=60
-embedded.mode=false
embedded.zk=false
enable.realtime.monitor=False
@@ -128,7 +127,7 @@ pre.workflow.manager.monitoring.host=airavata.host
pre.workflow.manager.monitoring.port=9093
pre.workflow.manager.name=AiravataPreWM
-profile_service=org.apache.airavata.service.profile.server.ProfileServiceServer
+profile_service.class=org.apache.airavata.service.profile.server.ProfileServiceServer
profile.service.jdbc.driver=org.mariadb.jdbc.Driver
profile.service.jdbc.password=123456
profile.service.jdbc.url=jdbc:mariadb://airavata.host:13306/profile_service
@@ -175,13 +174,8 @@
sharingcatalog.jdbc.url=jdbc:mariadb://airavata.host:13306/sharing_catalog
sharingcatalog.jdbc.user=airavata
sharingcatalog.validationQuery=SELECT 1 from CONFIGURATION
-start.submitter=true
-submitter.interval=10000
-
super.tenant.gatewayId=default
-threadpool.size=10
-
thrift.client.pool.abandoned.removal.enabled=true
thrift.client.pool.abandoned.removal.logged=false
diff --git a/airavata-api/src/test/resources/orchestrator.properties
b/airavata-api/src/test/resources/orchestrator.properties
index e84c429c06..0d09758ee6 100644
--- a/airavata-api/src/test/resources/orchestrator.properties
+++ b/airavata-api/src/test/resources/orchestrator.properties
@@ -17,10 +17,5 @@
# specific language governing permissions and limitations
# under the License.
#
-job.submitter=org.apache.airavata.orchestrator.core.impl.GFACEmbeddedJobSubmitter
job.validators=org.apache.airavata.orchestrator.core.validator.impl.BatchQueueValidator
-submitter.interval=10000
-threadpool.size=0
-start.submitter=true
-embedded.mode=true
enable.validation=false
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 a4af9ead4d..3cbf5b794c 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
@@ -127,7 +127,7 @@ sharing.registry.server.port={{ sharing_registry_port }}
###########################################################################
# API Server Configurations
###########################################################################
-apiserver=org.apache.airavata.api.server.AiravataAPIServer
+apiserver.class=org.apache.airavata.api.server.AiravataAPIServer
apiserver.name={{ api_server_name }}
apiserver.host={{ api_server_host }}
apiserver.port={{ api_server_port }}
@@ -142,10 +142,6 @@ orchestrator.server.host={{ orchestrator_host }}
orchestrator.server.port={{ orchestrator_port }}
orchestrator.server.min.threads=50
job.validators=org.apache.airavata.orchestrator.core.validator.impl.BatchQueueValidator,org.apache.airavata.orchestrator.core.validator.impl.ExperimentStatusValidator
-submitter.interval=10000
-threadpool.size=10
-start.submitter=true
-embedded.mode=true
enable.validation=true
host.scheduler=org.apache.airavata.orchestrator.core.schedule.DefaultHostScheduler
@@ -194,7 +190,7 @@ credential.store.jdbc.password={{ db_password }}
credential.store.jdbc.driver=org.mariadb.jdbc.Driver
credential.store.server.host={{ cred_store_server_host }}
credential.store.server.port={{ cred_store_port }}
-credentialstore=org.apache.airavata.credential.store.server.CredentialStoreServer
+credential.store.class=org.apache.airavata.credential.store.server.CredentialStoreServer
credential.store.jdbc.validationQuery=SELECT 1 from CONFIGURATION
# SSH PKI key pair or ssh password can be used SSH based sshKeyAuthentication
is used.
@@ -282,7 +278,7 @@ in.memory.cache.size=1000
###########################################################################
profile.service.server.host={{ profile_service_host }}
profile.service.server.port={{ profile_service_port }}
-profile_service=org.apache.airavata.service.profile.server.ProfileServiceServer
+profile_service.class=org.apache.airavata.service.profile.server.ProfileServiceServer
# MariaDB properties
profile.service.jdbc.url=jdbc:mariadb://{{ db_server }}:3306/{{
profile_service }}
profile.service.jdbc.user={{ db_user }}
@@ -300,7 +296,7 @@ iam.server.super.admin.password={{
iam_server_super_admin_password }}
###########################################################################
# DB Event Manager Runner
###########################################################################
-db_event_manager=org.apache.airavata.db.event.manager.DBEventManagerRunner
+db_event_manager.class=org.apache.airavata.db.event.manager.DBEventManagerRunner
###########################################################################
# ThriftClientPool Configuration
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 7d78fcd6ba..cc64b5ccd6 100644
--- a/dev-tools/ansible/roles/registry/templates/airavata-server.properties.j2
+++ b/dev-tools/ansible/roles/registry/templates/airavata-server.properties.j2
@@ -128,7 +128,7 @@ userprofile.mongodb.port=27017
###########################################################################
# API Server Configurations
###########################################################################
-apiserver=org.apache.airavata.api.server.AiravataAPIServer
+apiserver.class=org.apache.airavata.api.server.AiravataAPIServer
apiserver.name={{ api_server_name }}
apiserver.host={{ api_server_host }}
apiserver.port={{ api_server_port }}
@@ -143,10 +143,6 @@ orchestrator.server.host={{ orchestrator_host }}
orchestrator.server.port={{ orchestrator_port }}
orchestrator.server.min.threads=50
job.validators=org.apache.airavata.orchestrator.core.validator.impl.BatchQueueValidator,org.apache.airavata.orchestrator.core.validator.impl.ExperimentStatusValidator
-submitter.interval=10000
-threadpool.size=10
-start.submitter=true
-embedded.mode=true
enable.validation=true
###########################################################################
@@ -205,7 +201,7 @@ credential.store.jdbc.password={{ db_password }}
credential.store.jdbc.driver=com.mysql.jdbc.Driver
credential.store.server.host={{ cred_store_server_host }}
credential.store.server.port={{ cred_store_port }}
-credentialstore=org.apache.airavata.credential.store.server.CredentialStoreServer
+credential.store.class=org.apache.airavata.credential.store.server.CredentialStoreServer
credential.stroe.jdbc.validationQuery=SELECT 1 from CONFIGURATION
# SSH PKI key pair or ssh password can be used SSH based sshKeyAuthentication
is used.
