Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

set MALLOC_ARENA_MAX to a lower dynamic value to prevent OOM #143

Merged
merged 2 commits into from
Feb 22, 2018
+11 −3
Merged

set MALLOC_ARENA_MAX to a lower dynamic value to prevent OOM #143

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5cfad01
set MALLOC_ARENA_MAX to a lower dynamic value to prevent OOM
Feb 21, 2018
6764cfd
be future-compatible with MaxMetaSpaceSize setting
Feb 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions start.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ def get_constants(metadata):
return constants


def set_jvm_memory(javaopts, vcap, java_version):
def set_jvm_memory(m2ee_section, vcap, java_version):
max_memory = os.environ.get('MEMORY_LIMIT')

if max_memory:
Expand Down Expand Up @@ -273,17 +273,25 @@ def set_jvm_memory(javaopts, vcap, java_version):
heap_size,
)
)
javaopts = m2ee_section['javaopts']

javaopts.append('-Xmx%s' % heap_size)
javaopts.append('-Xms%s' % heap_size)

if java_version.startswith('7'):
javaopts.append('-XX:MaxPermSize=256M')
elif java_version.startswith('8'):
else:
javaopts.append('-XX:MaxMetaspaceSize=256M')

logger.debug('Java heap size set to %s' % heap_size)

if os.getenv('MALLOC_ARENA_MAX'):
logger.info('Using provided environment setting for MALLOC_ARENA_MAX')
else:
m2ee_section['custom_environment']['MALLOC_ARENA_MAX'] = str(
max(1, limit / 1024) * 2
)


def _get_s3_specific_config(vcap_services, m2ee):
access_key = secret = bucket = encryption_keys = key_suffix = None
Expand Down Expand Up @@ -671,7 +679,7 @@ def set_up_m2ee_client(vcap_data):
m2ee.config.get_runtime_version()
)
set_jvm_memory(
m2ee.config._conf['m2ee']['javaopts'],
m2ee.config._conf['m2ee'],
vcap_data,
java_version,
)
Expand Down