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:47 UTC
[airavata] 01/01: Merge remote-tracking branch 'origin/staging'
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 }}