xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Omaha #3225 Reduce default hibernate connections" into omaha_14.4.1

Browse source 
Former-commit-id: 1ae399d824 [formerly 5e2f46e892 [formerly 762a5f67f31537f481f38246fba7cf074f1c859f]]
Former-commit-id: 5e2f46e892
Former-commit-id: c10194a645
This commit is contained in:
Nate Jensen 2014-06-24 12:37:56 -05:00 • committed by Gerrit Code Review
commit 61fca699d8
18 changed files with 62 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
edexOsgi/build.edex/esb/conf/db/hibernateConfig/damCatalog/hibernate.cfg.xml
View file

@ -59,12 +59,15 @@
<!-- c3p0 Connection Pool Properties -->
<!-- Additional properties may be added to c3p0.properties -->
<property name="hibernate.c3p0.initial_pool_size">0</property>
<property name="hibernate.c3p0.min_size">0</property>
<property name="hibernate.c3p0.max_size">10</property>
<property name="hibernate.c3p0.acquire_increment">1</property>
<property name="hibernate.c3p0.idle_test_period">60</property>
<property name="hibernate.c3p0.idle_test_period">60</property>
<property name="hibernate.c3p0.max_idle_time">600</property>
<property name="hibernate.c3p0.preferred_test_query">select 1</property>
<property name="hibernate.c3p0.timeout">300</property>
<property name="hibernate.c3p0.max_size">10</property>
<property name="hibernate.c3p0.max_statements">10</property>
<property name="hibernate.c3p0.min_size">1</property>
<!-- Cache Properties -->

17
edexOsgi/build.edex/esb/conf/db/hibernateConfig/fxa/hibernate.cfg.xml
View file

@ -59,13 +59,16 @@
<!-- c3p0 Connection Pool Properties -->
<!-- Additional properties may be added to c3p0.properties -->
<property name="hibernate.c3p0.acquire_increment">1</property>
<property name="hibernate.c3p0.idle_test_period">60</property>
<property name="hibernate.c3p0.timeout">300</property>
<property name="hibernate.c3p0.max_size">25</property>
<property name="hibernate.c3p0.max_statements">10</property>
<property name="hibernate.c3p0.min_size">1</property>
<property name="hibernate.c3p0.initial_pool_size">0</property>
<property name="hibernate.c3p0.min_size">0</property>
<property name="hibernate.c3p0.max_size">25</property>
<property name="hibernate.c3p0.acquire_increment">1</property>
<property name="hibernate.c3p0.idle_test_period">60</property>
<property name="hibernate.c3p0.max_idle_time">600</property>
<property name="hibernate.c3p0.preferred_test_query">select 1</property>
<property name="hibernate.c3p0.timeout">300</property>
<property name="hibernate.c3p0.max_statements">10</property>
<!-- Cache Properties -->
<property name="hibernate.cache.use_second_level_cache">false</property>

7
edexOsgi/build.edex/esb/conf/db/hibernateConfig/hmdb/hibernate.cfg.xml
View file

@ -59,12 +59,15 @@
<!-- c3p0 Connection Pool Properties -->
<!-- Additional properties may be added to c3p0.properties -->
<property name="hibernate.c3p0.initial_pool_size">0</property>
<property name="hibernate.c3p0.min_size">0</property>
<property name="hibernate.c3p0.max_size">10</property>
<property name="hibernate.c3p0.acquire_increment">1</property>
<property name="hibernate.c3p0.idle_test_period">60</property>
<property name="hibernate.c3p0.max_idle_time">600</property>
<property name="hibernate.c3p0.preferred_test_query">select 1</property>
<property name="hibernate.c3p0.timeout">300</property>
<property name="hibernate.c3p0.max_size">10</property>
<property name="hibernate.c3p0.max_statements">10</property>
<property name="hibernate.c3p0.min_size">1</property>
<!-- Cache Properties -->

15
edexOsgi/build.edex/esb/conf/db/hibernateConfig/ihfs/hibernate.cfg.xml
View file

@ -59,12 +59,15 @@
<!-- c3p0 Connection Pool Properties -->
<!-- Additional properties may be added to c3p0.properties -->
<property name="hibernate.c3p0.acquire_increment">1</property>
<property name="hibernate.c3p0.idle_test_period">60</property>
<property name="hibernate.c3p0.timeout">300</property>
<property name="hibernate.c3p0.max_size">10</property>
<property name="hibernate.c3p0.max_statements">10</property>
<property name="hibernate.c3p0.min_size">1</property>
<property name="hibernate.c3p0.initial_pool_size">0</property>
<property name="hibernate.c3p0.min_size">0</property>
<property name="hibernate.c3p0.max_size">10</property>
<property name="hibernate.c3p0.acquire_increment">1</property>
<property name="hibernate.c3p0.idle_test_period">60</property>
<property name="hibernate.c3p0.max_idle_time">600</property>
<property name="hibernate.c3p0.preferred_test_query">select 1</property>
<property name="hibernate.c3p0.timeout">300</property>
<property name="hibernate.c3p0.max_statements">10</property>
<!-- Cache Properties -->

15
edexOsgi/build.edex/esb/conf/db/hibernateConfig/maps/hibernate.cfg.xml
View file

@ -59,12 +59,15 @@
<!-- c3p0 Connection Pool Properties -->
<!-- Additional properties may be added to c3p0.properties -->
<property name="hibernate.c3p0.acquire_increment">1</property>
<property name="hibernate.c3p0.idle_test_period">60</property>
<property name="hibernate.c3p0.timeout">300</property>
<property name="hibernate.c3p0.min_size">1</property>
<property name="hibernate.c3p0.max_size">20</property>
<property name="hibernate.c3p0.max_statements">20</property>
<property name="hibernate.c3p0.initial_pool_size">0</property>
<property name="hibernate.c3p0.min_size">0</property>
<property name="hibernate.c3p0.max_size">20</property>
<property name="hibernate.c3p0.acquire_increment">1</property>
<property name="hibernate.c3p0.idle_test_period">60</property>
<property name="hibernate.c3p0.max_idle_time">600</property>
<property name="hibernate.c3p0.preferred_test_query">select 1</property>
<property name="hibernate.c3p0.timeout">300</property>
<property name="hibernate.c3p0.max_statements">20</property>
<!-- Cache Properties -->

16
edexOsgi/build.edex/esb/conf/db/hibernateConfig/metadata/hibernate.cfg.xml
View file

@ -60,12 +60,16 @@
<!-- c3p0 Connection Pool Properties -->
<!-- Additional properties may be added to c3p0.properties -->
<property name="hibernate.c3p0.idle_test_period">60</property>
<property name="hibernate.c3p0.timeout">${db.metadata.pool.timeout}</property>
<property name="hibernate.c3p0.max_statements">${db.metadata.pool.max}</property>
<property name="hibernate.c3p0.acquire_increment">5</property>
<property name="hibernate.c3p0.min_size">${db.metadata.pool.min}</property>
<property name="hibernate.c3p0.max_size">${db.metadata.pool.max}</property>
<property name="hibernate.c3p0.initial_pool_size">1</property>
<property name="hibernate.c3p0.min_size">1</property>
<property name="hibernate.c3p0.max_size">${db.metadata.pool.max}</property>
<property name="hibernate.c3p0.acquire_increment">1</property>
<property name="hibernate.c3p0.idle_test_period">60</property>
<property name="hibernate.c3p0.max_idle_time">600</property>
<property name="hibernate.c3p0.preferred_test_query">select 1</property>
<property name="hibernate.c3p0.timeout">${db.metadata.pool.timeout}</property>
<property name="hibernate.c3p0.max_statements">10</property>
<property name="hibernate.generate_statistics">false</property>
<property name="hibernate.transaction.factory_class">org.hibernate.transaction.JDBCTransactionFactory</property>

15
edexOsgi/build.edex/esb/conf/db/hibernateConfig/ncep/hibernate.cfg.xml
View file

@ -56,12 +56,15 @@
<!-- c3p0 Connection Pool Properties -->
<!-- Additional properties may be added to c3p0.properties -->
<property name="hibernate.c3p0.acquire_increment">1</property>
<property name="hibernate.c3p0.idle_test_period">60</property>
<property name="hibernate.c3p0.timeout">60</property>
<property name="hibernate.c3p0.max_size">10</property>
<property name="hibernate.c3p0.max_statements">1000</property>
<property name="hibernate.c3p0.min_size">1</property>
<property name="hibernate.c3p0.initial_pool_size">0</property>
<property name="hibernate.c3p0.min_size">0</property>
<property name="hibernate.c3p0.max_size">10</property>
<property name="hibernate.c3p0.acquire_increment">1</property>
<property name="hibernate.c3p0.idle_test_period">60</property>
<property name="hibernate.c3p0.max_idle_time">600</property>
<property name="hibernate.c3p0.preferred_test_query">select 1</property>
<property name="hibernate.c3p0.timeout">300</property>
<property name="hibernate.c3p0.max_statements">10</property>
<!-- Cache Properties -->

5
edexOsgi/build.edex/esb/conf/wrapper.conf
View file

@ -107,9 +107,8 @@ wrapper.java.additional.db.3=-Ddc.db.name=${DC_DB_NAME}
wrapper.java.additional.db.4=-Dfxa.db.name=${FXA_DB_NAME}
wrapper.java.additional.db.5=-Dhm.db.name=${HM_DB_NAME}
wrapper.java.additional.db.6=-Dih.db.name=${IH_DB_NAME}
wrapper.java.additional.db.7=-Ddb.metadata.pool.min=${METADATA_POOL_MIN}
wrapper.java.additional.db.8=-Ddb.metadata.pool.max=${METADATA_POOL_MAX}
wrapper.java.additional.db.9=-Ddb.metadata.pool.timeout=${METADATA_POOL_TIMEOUT}
wrapper.java.additional.db.7=-Ddb.metadata.pool.max=${METADATA_POOL_MAX}
wrapper.java.additional.db.8=-Ddb.metadata.pool.timeout=${METADATA_POOL_TIMEOUT}
# site ID of EDEX for localization and site aware services
wrapper.java.additional.site.1=-Daw.site.identifier=${AW_SITE_IDENTIFIER}

2
edexOsgi/build.edex/esb/etc/centralRegistry.sh
View file

@ -26,7 +26,5 @@ export EDEX_JMX_PORT=1622
export LOG_CONF=logback-registry.xml
export MGMT_PORT=9607
export METADATA_POOL_MIN=10
export METADATA_POOL_MAX=25
export METADATA_POOL_TIMEOUT=60
export CLUSTER_ID=NCF

1
edexOsgi/build.edex/esb/etc/datadeliveryonly.sh
View file

@ -22,7 +22,6 @@
export INIT_MEM=512 # in Meg
export MAX_MEM=1536 # in Meg
export METADATA_POOL_MIN=10
export EDEX_DEBUG_PORT=5009
export EDEX_JMX_PORT=1620
export LOG_CONF=logback-registry.xml

1
edexOsgi/build.edex/esb/etc/dataprovideragent.sh
View file

@ -22,7 +22,6 @@
export INIT_MEM=512 # in Meg
export MAX_MEM=1536 # in Meg
export MAX_PERM_SIZE=192m
export METADATA_POOL_MIN=10
export EDEX_DEBUG_PORT=5010
export EDEX_JMX_PORT=1621
export LOG_CONF=logback-dataprovideragent.xml

1
edexOsgi/build.edex/esb/etc/default.sh
View file

@ -23,7 +23,6 @@ export MAX_MEM=1300 # in Meg
export MAX_PERM_SIZE=128m
export EDEX_JMX_PORT=1616
export EDEX_DEBUG_PORT=5005
export METADATA_POOL_MIN=5
export METADATA_POOL_MAX=50
export METADATA_POOL_TIMEOUT=300
export DEBUG_PARAM_1=""

1
edexOsgi/build.edex/esb/etc/devRegistry.sh
View file

@ -21,7 +21,6 @@
export MAX_MEM=1536 # in Meg
export MAX_PERM_SIZE=192m
export METADATA_POOL_MIN=10
export EDEX_DEBUG_PORT=5012
export EDEX_JMX_PORT=1620
export LOG_CONF=logback-registry.xml

1
edexOsgi/build.edex/esb/etc/ingest.sh
View file

@ -22,7 +22,6 @@
export INIT_MEM=512 # in Meg
export MAX_MEM=896 # in Meg
export METADATA_POOL_MIN=10
export EDEX_DEBUG_PORT=5006
export EDEX_JMX_PORT=1617
export LOG_CONF=logback-ingest.xml

3
edexOsgi/build.edex/esb/etc/ingestDat.sh
View file

@ -21,8 +21,7 @@
export INIT_MEM=256 # in Meg
export MAX_MEM=1792 # in Meg
export METADATA_POOL_MIN=15
export METADATA_POOL_MAX=30
export METADATA_POOL_MAX=25
export EDEX_DEBUG_PORT=5008
export EDEX_JMX_PORT=1619
export MGMT_PORT=9604

1
edexOsgi/build.edex/esb/etc/ingestGrib.sh
View file

@ -21,7 +21,6 @@
export INIT_MEM=128 # in Meg
export MAX_MEM=512 # in Meg
export METADATA_POOL_MIN=4
export METADATA_POOL_MAX=10
export EDEX_DEBUG_PORT=5007
export EDEX_JMX_PORT=1618

2
edexOsgi/build.edex/esb/etc/ingestHydro.sh
View file

@ -22,7 +22,7 @@
export INIT_MEM=412 # in Meg
export MAX_MEM=796 # in Meg
export METADATA_POOL_MIN=4
export METADATA_POOL_MAX=25
export EDEX_DEBUG_PORT=5006
export EDEX_JMX_PORT=1617
export LOG4J_CONF=log4j-ingest.xml

1
edexOsgi/build.edex/esb/etc/registry.sh
View file

@ -26,6 +26,5 @@ export EDEX_JMX_PORT=1620
export LOG_CONF=logback-registry.xml
export MGMT_PORT=9605
export METADATA_POOL_MIN=5
export METADATA_POOL_MAX=20
export METADATA_POOL_TIMEOUT=60