From bca70fb7fa71c6fd333eb8388d9b72a605a5549f Mon Sep 17 00:00:00 2001 From: Benjamin Phillippe Date: Tue, 2 Sep 2014 10:00:35 -0500 Subject: [PATCH] Issue #3560 Fix for registry memory issue Former-commit-id: c00e99fa3328136dbd0f5859467676d9d965771d [formerly 12914fb1e5c4330c6767ab93c8ee4dfaeb77a97c] [formerly ab8b2ef4739779cd0cae3d9849a7cd2b63997391] [formerly c00e99fa3328136dbd0f5859467676d9d965771d [formerly 12914fb1e5c4330c6767ab93c8ee4dfaeb77a97c] [formerly ab8b2ef4739779cd0cae3d9849a7cd2b63997391] [formerly 2da57d3bc2a3ffabf3555fa4cc271cad46754904 [formerly ab8b2ef4739779cd0cae3d9849a7cd2b63997391 [formerly a6e4a2cac4d6f9390c5181439a6c834db56a95c6]]]] Former-commit-id: 2da57d3bc2a3ffabf3555fa4cc271cad46754904 Former-commit-id: f8eac1c5dd946496f7d8b1849a26f2426439b1c7 [formerly c180ce27581909ddcc5e6e55d9330dede55e4b5f] [formerly 297c1c315b814d7db8fde2a56eeb56d15518cf06 [formerly 393c67dbe94cbde3f3daaa27669ca05616d6b9d7]] Former-commit-id: 35b5f0063d9854e2e07156583373ec6fa6d63dbf [formerly 565c858c3e7c5abf37df6f0ecf098dbf4fbbe64d] Former-commit-id: 94ffd5d5f0889f718b6267761705f5c62614df74 --- edexOsgi/build.edex/esb/conf/wrapper.conf | 1 + edexOsgi/build.edex/esb/etc/centralRegistry.sh | 2 ++ edexOsgi/build.edex/esb/etc/default.sh | 2 ++ edexOsgi/build.edex/esb/etc/devRegistry.sh | 2 ++ edexOsgi/build.edex/esb/etc/registry.sh | 2 ++ 5 files changed, 9 insertions(+) diff --git a/edexOsgi/build.edex/esb/conf/wrapper.conf b/edexOsgi/build.edex/esb/conf/wrapper.conf index fcccb8e844..bbd19207f0 100644 --- a/edexOsgi/build.edex/esb/conf/wrapper.conf +++ b/edexOsgi/build.edex/esb/conf/wrapper.conf @@ -101,6 +101,7 @@ wrapper.java.additional.gc.1=-XX:+UseConcMarkSweepGC wrapper.java.additional.gc.2=-XX:+CMSIncrementalMode wrapper.java.additional.gc.3=-XX:+HeapDumpOnOutOfMemoryError wrapper.java.additional.gc.4=-XX:HeapDumpPath=/data/fxa/cave/${SHORT_HOSTNAME}/ +wrapper.java.additional.gc.5=-XX:SoftRefLRUPolicyMSPerMB=${SOFT_REF_LRU_POLICY_MS_PER_MB} # use qpid binding URL instead of default address string format wrapper.java.additional.qpid.1=-Dqpid.dest_syntax=BURL diff --git a/edexOsgi/build.edex/esb/etc/centralRegistry.sh b/edexOsgi/build.edex/esb/etc/centralRegistry.sh index c6edad4b3c..cd8749e46b 100644 --- a/edexOsgi/build.edex/esb/etc/centralRegistry.sh +++ b/edexOsgi/build.edex/esb/etc/centralRegistry.sh @@ -30,3 +30,5 @@ export METADATA_POOL_MIN=10 export METADATA_POOL_MAX=25 export METADATA_POOL_TIMEOUT=60 export CLUSTER_ID=NCF + +export SOFT_REF_LRU_POLICY_MS_PER_MB=50 diff --git a/edexOsgi/build.edex/esb/etc/default.sh b/edexOsgi/build.edex/esb/etc/default.sh index 7d2a181151..e6bc9127c5 100644 --- a/edexOsgi/build.edex/esb/etc/default.sh +++ b/edexOsgi/build.edex/esb/etc/default.sh @@ -48,3 +48,5 @@ export WRAPPER_DEADLOCK_ACTION=RESTART export WRAPPER_ON_EXIT_ACTION=RESTART export WRAPPER_TRIGGER_ACTION=RESTART export WRAPPER_USE_SYSTEM_JAVA=false + +export SOFT_REF_LRU_POLICY_MS_PER_MB=1000 diff --git a/edexOsgi/build.edex/esb/etc/devRegistry.sh b/edexOsgi/build.edex/esb/etc/devRegistry.sh index 86b41aaf4c..62c2e47b27 100644 --- a/edexOsgi/build.edex/esb/etc/devRegistry.sh +++ b/edexOsgi/build.edex/esb/etc/devRegistry.sh @@ -30,3 +30,5 @@ export EBXML_REGISTRY_FEDERATION_ENABLED=false export NCF_HOST=${DATADELIVERY_HOST} export NCF_ADDRESS=http://${NCF_HOST}:${EBXML_REGISTRY_WEBSERVER_PORT} export NCF_BANDWIDTH_MANAGER_SERVICE=http://${NCF_HOST}:${EBXML_THRIFT_SERVICE_PORT}/services + +export SOFT_REF_LRU_POLICY_MS_PER_MB=50 diff --git a/edexOsgi/build.edex/esb/etc/registry.sh b/edexOsgi/build.edex/esb/etc/registry.sh index 9797f22d08..69002eae13 100644 --- a/edexOsgi/build.edex/esb/etc/registry.sh +++ b/edexOsgi/build.edex/esb/etc/registry.sh @@ -29,3 +29,5 @@ export MGMT_PORT=9605 export METADATA_POOL_MIN=5 export METADATA_POOL_MAX=20 export METADATA_POOL_TIMEOUT=60 + +export SOFT_REF_LRU_POLICY_MS_PER_MB=50 \ No newline at end of file