You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2019/10/31 15:25:46 UTC
[airavata] branch master updated (e2c8114 -> 0af0fbe)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git.
from e2c8114 Adding production django/vars.yml file
add c94f3be Merge pull request #233 from apache/master
add ed86689 added script to migrate missing active users from keycloak to database
add 45718db refactored the migration script
add 5b97b0a refactored sharing migration script
add 8df1313 refactored sharing migration script
add 3a0c81b Merge pull request #235 from aarushiibisht/abisht_airavata_staging
add c6a6ae9 AIRAVATA-3186 Enable abandoned object removal in ThriftClientPool
add f674a98 AIRAVATA-3019 last job status is most recent
add 1e66dfe AIRAVATA-3238 Adding migration to ide-integration module
add bbb43a6 AIRAVATA-3019 Additional vhost aliases support
add 43453fd Fixing missing libraries in distribution
add fdf5079 AIRAVATA-3250 Link to PGA from Django portal
add f007d55 AIRAVATA-3234 check for null URI/URI_COLLECTION values
add 59b4afd AIRAVATA-3233 Adding missing break statement
add cca4dce AIRAVATA-3186 Return registry client to the pool in all cases
add fdb503b Adding profile service properties
add dc4a55e Adding additional missing properties to data migrator
add 5f9542d Fixing order of arguments
new 0af0fbe Merge remote-tracking branch 'origin/staging'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../api/server/handler/AiravataServerHandler.java | 46 ++++---
.../scigap/develop/group_vars/all/vars.yml | 2 +-
.../scigap/staging/group_vars/all/vars.yml | 2 +
.../scigap/staging/host_vars/seagrid/vars.yml | 4 +
dev-tools/ansible/roles/api-orch/defaults/main.yml | 2 +
.../templates/airavata-server.properties.j2 | 5 +
dev-tools/ansible/roles/django/defaults/main.yml | 1 +
.../django/templates/django-ssl-vhost.conf.j2 | 8 ++
.../roles/django/templates/django-vhost.conf.j2 | 8 ++
.../roles/django/templates/settings_local.py.j2 | 4 +
.../ansible/roles/helix_setup/defaults/main.yml | 2 +
.../parser-wm/airavata-server.properties.j2 | 7 +-
.../participant/airavata-server.properties.j2 | 7 +-
.../post-wm/airavata-server.properties.j2 | 7 +-
.../templates/pre-wm/airavata-server.properties.j2 | 7 +-
.../ansible/roles/job_monitor/defaults/main.yml | 2 +
.../email-monitor/airavata-server.properties.j2 | 7 +-
.../helix/impl/workflow/WorkflowManager.java | 20 +--
modules/commons/pom.xml | 11 ++
.../airavata/common/utils/ApplicationSettings.java | 7 +
.../airavata/common/utils/ThriftClientPool.java | 70 +++++++---
.../common/utils/ThriftClientPoolTest.java | 141 +++++++++++++++++++++
.../src/main/resources/airavata-server.properties | 5 +
modules/distribution/pom.xml | 6 +
.../src/main/assembly/controller-bin-assembly.xml | 1 +
.../main/assembly/email-monitor-bin-assembly.xml | 1 +
.../src/main/assembly/parser-wm-bin-assembly.xml | 1 +
.../src/main/assembly/participant-bin-assembly.xml | 1 +
.../assembly/platform-monitor-bin-assembly.xml | 1 +
.../src/main/assembly/post-wm-bin-assembly.xml | 1 +
.../src/main/assembly/pre-wm-bin-assembly.xml | 1 +
.../assembly/realtime-monitor-bin-assembly.xml | 2 +
.../src/main/resources/airavata-server.properties | 7 +-
.../init/02-sharing-registry-migrations.sql | 5 +
.../apache/airavata/monitor/AbstractMonitor.java | 20 +--
.../cpi/impl/SimpleOrchestratorImpl.java | 1 +
.../server/OrchestratorServerHandler.java | 4 +-
.../api/service/handler/RegistryServerHandler.java | 3 +-
.../messaging/RegistryServiceDBEventHandler.java | 21 +--
.../migrator/airavata/AiravataDataMigrator.java | 100 ++++++++++++++-
.../resources/airavata-server.properties.sample | 13 ++
pom.xml | 6 +
42 files changed, 492 insertions(+), 78 deletions(-)
create mode 100644 modules/commons/src/test/java/org/apache/airavata/common/utils/ThriftClientPoolTest.java
create mode 100644 modules/ide-integration/src/main/resources/database_scripts/init/02-sharing-registry-migrations.sql
[airavata] 01/01: Merge remote-tracking branch 'origin/staging'
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 0af0fbe7914e5b1a8b6ad473d63519aca789f4a8
Merge: e2c8114 5f9542d
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Thu Oct 31 11:25:13 2019 -0400
Merge remote-tracking branch 'origin/staging'
.../api/server/handler/AiravataServerHandler.java | 46 ++++---
.../scigap/develop/group_vars/all/vars.yml | 2 +-
.../scigap/staging/group_vars/all/vars.yml | 2 +
.../scigap/staging/host_vars/seagrid/vars.yml | 4 +
dev-tools/ansible/roles/api-orch/defaults/main.yml | 2 +
.../templates/airavata-server.properties.j2 | 5 +
dev-tools/ansible/roles/django/defaults/main.yml | 1 +
.../django/templates/django-ssl-vhost.conf.j2 | 8 ++
.../roles/django/templates/django-vhost.conf.j2 | 8 ++
.../roles/django/templates/settings_local.py.j2 | 4 +
.../ansible/roles/helix_setup/defaults/main.yml | 2 +
.../parser-wm/airavata-server.properties.j2 | 7 +-
.../participant/airavata-server.properties.j2 | 7 +-
.../post-wm/airavata-server.properties.j2 | 7 +-
.../templates/pre-wm/airavata-server.properties.j2 | 7 +-
.../ansible/roles/job_monitor/defaults/main.yml | 2 +
.../email-monitor/airavata-server.properties.j2 | 7 +-
.../helix/impl/workflow/WorkflowManager.java | 20 +--
modules/commons/pom.xml | 11 ++
.../airavata/common/utils/ApplicationSettings.java | 7 +
.../airavata/common/utils/ThriftClientPool.java | 70 +++++++---
.../common/utils/ThriftClientPoolTest.java | 141 +++++++++++++++++++++
.../src/main/resources/airavata-server.properties | 5 +
modules/distribution/pom.xml | 6 +
.../src/main/assembly/controller-bin-assembly.xml | 1 +
.../main/assembly/email-monitor-bin-assembly.xml | 1 +
.../src/main/assembly/parser-wm-bin-assembly.xml | 1 +
.../src/main/assembly/participant-bin-assembly.xml | 1 +
.../assembly/platform-monitor-bin-assembly.xml | 1 +
.../src/main/assembly/post-wm-bin-assembly.xml | 1 +
.../src/main/assembly/pre-wm-bin-assembly.xml | 1 +
.../assembly/realtime-monitor-bin-assembly.xml | 2 +
.../src/main/resources/airavata-server.properties | 7 +-
.../init/02-sharing-registry-migrations.sql | 5 +
.../apache/airavata/monitor/AbstractMonitor.java | 20 +--
.../cpi/impl/SimpleOrchestratorImpl.java | 1 +
.../server/OrchestratorServerHandler.java | 4 +-
.../api/service/handler/RegistryServerHandler.java | 3 +-
.../messaging/RegistryServiceDBEventHandler.java | 21 +--
.../migrator/airavata/AiravataDataMigrator.java | 100 ++++++++++++++-
.../resources/airavata-server.properties.sample | 13 ++
pom.xml | 6 +
42 files changed, 492 insertions(+), 78 deletions(-)
diff --cc dev-tools/ansible/roles/helix_setup/templates/participant/airavata-server.properties.j2
index 3a3db8b,dae242c..f22eb96
--- a/dev-tools/ansible/roles/helix_setup/templates/participant/airavata-server.properties.j2
+++ b/dev-tools/ansible/roles/helix_setup/templates/participant/airavata-server.properties.j2
@@@ -93,4 -93,9 +93,9 @@@ data.parser.delete.container=Tru
###########################################################################
# Data Staging Task Level Configurations
###########################################################################
- enable.streaming.transfer=False
-enable.streaming.transfer=True
++enable.streaming.transfer=False
+
+ ###########################################################################
+ # ThriftClientPool Configuration
+ ###########################################################################
+ thrift.client.pool.abandoned.removal.enabled={{ thrift_client_pool_abandoned_removal_enabled }}