This is an automated email from the ASF dual-hosted git repository.
machristie 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 232ef5ced4 ide-integration fixes: add missing table to migration
script and default properties
232ef5ced4 is described below
commit 232ef5ced46e3467a589751a652fa85e26876777
Author: Marcus Christie <[email protected]>
AuthorDate: Tue Mar 28 09:21:56 2023 -0400
ide-integration fixes: add missing table to migration script and default
properties
---
.../init/04-expcatalog-migrations.sql | 20 +++++++++++++++++++-
.../src/main/resources/airavata-server.properties | 6 ++++++
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git
a/modules/ide-integration/src/main/containers/database_scripts/init/04-expcatalog-migrations.sql
b/modules/ide-integration/src/main/containers/database_scripts/init/04-expcatalog-migrations.sql
index 4367d25c33..e3ebde0753 100644
---
a/modules/ide-integration/src/main/containers/database_scripts/init/04-expcatalog-migrations.sql
+++
b/modules/ide-integration/src/main/containers/database_scripts/init/04-expcatalog-migrations.sql
@@ -3,7 +3,7 @@ use experiment_catalog;
ALTER TABLE EXPERIMENT_INPUT ADD COLUMN IF NOT EXISTS OVERRIDE_FILENAME
VARCHAR(255);
ALTER TABLE PROCESS_INPUT ADD COLUMN IF NOT EXISTS OVERRIDE_FILENAME
VARCHAR(255);
-CREATE TABLE GATEWAY_USAGE_REPORTING_COMMAND (
+CREATE TABLE IF NOT EXISTS GATEWAY_USAGE_REPORTING_COMMAND (
GATEWAY_ID VARCHAR(255) NOT NULL,
COMPUTE_RESOURCE_ID VARCHAR(255) NOT NULL,
COMMAND LONGTEXT NOT NULL,
@@ -13,3 +13,21 @@ CREATE TABLE GATEWAY_USAGE_REPORTING_COMMAND (
-- AIRAVATA-3369: Convert USER_FRIENDLY_DESCRIPTION from VARCHAR to TEXT (CLOB)
alter table EXPERIMENT_INPUT modify column USER_FRIENDLY_DESCRIPTION TEXT;
alter table PROCESS_INPUT modify column USER_FRIENDLY_DESCRIPTION TEXT;
+
+CREATE TABLE IF NOT EXISTS COMPUTE_RESOURCE_SCHEDULING (
+ EXPERIMENT_ID varchar(255) NOT NULL,
+ RESOURCE_HOST_ID varchar(255) NOT NULL,
+ TOTAL_CPU_COUNT INT,
+ NODE_COUNT INT,
+ NUMBER_OF_THREADS INT,
+ QUEUE_NAME varchar(255) NOT NULL,
+ WALL_TIME_LIMIT INT,
+ TOTAL_PHYSICAL_MEMORY INT,
+ STATIC_WORKING_DIR varchar(255),
+ OVERRIDE_LOGIN_USER_NAME varchar(255),
+ OVERRIDE_SCRATCH_LOCATION varchar(255),
+ OVERRIDE_ALLOCATION_PROJECT_NUMBER varchar(255),
+ PARALLEL_GROUP_COUNT INT,
+ PRIMARY KEY (EXPERIMENT_ID,RESOURCE_HOST_ID,QUEUE_NAME),
+ FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON
DELETE CASCADE
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
\ No newline at end of file
diff --git
a/modules/ide-integration/src/main/resources/airavata-server.properties
b/modules/ide-integration/src/main/resources/airavata-server.properties
index c0d3e56b38..db2cdf8211 100644
--- a/modules/ide-integration/src/main/resources/airavata-server.properties
+++ b/modules/ide-integration/src/main/resources/airavata-server.properties
@@ -290,3 +290,9 @@ thrift.client.pool.abandoned.removal.enabled=true
pre.workflow.manager.loadbalance.clusters=false
post.workflow.manager.loadbalance.clusters=false
+
+###########################################################################
+# Metascheduler And Compute Resource Monitoring Configuration
+###########################################################################
+metaschedluer.job.scanning.enable=false
+data.analyzer.job.scanning.enable=false
