Skip to content

Commit ec91102

Browse files
authored
GH-534: Read heap_size from env variable, if it is available (#538)
* GH-534: Read heap_size from env variable, if it is available * update changelog
1 parent ca6b2cd commit ec91102

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
#### Version 0.11.7 (TBD)
44
* Fixed a bug that made it possible to leak filesystem resources by opening duplicate file descriptors for the same Segment file. At scale, this could prematurely lead to "too many open files" errors.
5+
* [GH-534](https://github.com/cinchapi/concourse/issues/534): Fixed a bug that caused the `CONCOURSE_HEAP_SIZE` environment variable, if set, not to be read on server startup.
56

67
#### Version 0.11.6 (July 6, 2024)
78
* Added new configuration options for initializing Concourse Server with custom admin credentials upon first run. These options enhance security by allowing a non-default usernames and passwords before starting the server.

concourse-server/scripts/concourse

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,11 @@ if [ ! -z "$RDP_PREF" ] && [ "$RDP_PREF" -ne "0" ]; then
250250
fi
251251

252252
#heap_size
253-
HEAP_PREF=`cat $PREFS | grep -e '^heap_size\s*=\s*[0-9]\{1,\}\(m\|M\|mb\|MB\|g\|G\|gb\|GB\)$' | head -n1 | cut -d'=' -f2 | tr -d ' '`
253+
if [ ! -z "$CONCOURSE_HEAP_SIZE" ]; then
254+
HEAP_PREF=$CONCOURSE_HEAP_SIZE
255+
else
256+
HEAP_PREF=`cat $PREFS | grep -e '^heap_size\s*=\s*[0-9]\{1,\}\(m\|M\|mb\|MB\|g\|G\|gb\|GB\)$' | head -n1 | cut -d'=' -f2 | tr -d ' '`
257+
fi
254258
HEAP_PREF=`echo $HEAP_PREF | awk '{print tolower($0)}'`
255259
HEAP=${HEAP_PREF//[!0-9]/}
256260
if [[ $HEAP_PREF == *g* ]]; then

0 commit comments

Comments
 (0)