Skip to content

Commit

Permalink
feature(container): Make domain1 more production ready
Browse files Browse the repository at this point in the history
1. Moving some specifics from the startup script to the build time config,
   saving time during startup.
2. Enlarging thread pools, setting better options for memory management
   and many other optimizations for using in production.

See also gdcc/dataverse-kubernetes#218
Relates to IQSS#5292
  • Loading branch information
poikilotherm committed Jun 11, 2021
1 parent 6b96b71 commit c75b507
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 17 deletions.
39 changes: 37 additions & 2 deletions conf/container/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -117,14 +117,49 @@ RUN true && \
${ASADMIN} start-domain ${DOMAIN_NAME} && \
# Allow access to admin with password only
${ASADMIN} enable-secure-admin && \

### CONTAINER USAGE ENABLEMENT
# List & delete memory settings from domain
for MEMORY_JVM_OPTION in $(asadmin --user=${ADMIN_USER} --passwordfile=${PASSWORD_FILE} list-jvm-options | grep "Xm[sx]\|Xss"); \
for MEMORY_JVM_OPTION in $(${ASADMIN} list-jvm-options | grep "Xm[sx]\|Xss\|NewRatio"); \
do \
${ASADMIN} delete-jvm-options $MEMORY_JVM_OPTION;\
${ASADMIN} delete-jvm-options $(echo $MEMORY_JVM_OPTION | sed -e 's/:/\\:/g'); \
done && \
${ASADMIN} create-jvm-options '-XX\:+UseContainerSupport:-XX\:MaxRAMPercentage=${ENV=MEM_MAX_RAM_PERCENTAGE}:-Xss${ENV=MEM_XSS}' && \
# Set logging to console only
${ASADMIN} set-log-attributes com.sun.enterprise.server.logging.GFFileHandler.logtoFile=false && \

### PRODUCTION READINESS
${ASADMIN} create-jvm-options '-XX\:+UseG1GC:-XX\:+UseStringDeduplication:-XX\:MaxGCPauseMillis=500' && \
${ASADMIN} create-jvm-options '-XX\:MetaspaceSize=256m:-XX\:MaxMetaspaceSize=2g:-XX\:+IgnoreUnrecognizedVMOptions' && \
# Enlarge thread pools
${ASADMIN} set server-config.thread-pools.thread-pool.http-thread-pool.max-thread-pool-size="50" && \
${ASADMIN} set server-config.thread-pools.thread-pool.http-thread-pool.max-queue-size="" && \
${ASADMIN} set default-config.thread-pools.thread-pool.thread-pool-1.max-thread-pool-size="250" && \
# Enable file caching
${ASADMIN} set server-config.network-config.protocols.protocol.http-listener-1.http.file-cache.enabled="true" && \
${ASADMIN} set server-config.network-config.protocols.protocol.http-listener-2.http.file-cache.enabled="true" && \
${ASADMIN} set default-config.network-config.protocols.protocol.http-listener-1.http.file-cache.enabled="true" && \
${ASADMIN} set default-config.network-config.protocols.protocol.http-listener-2.http.file-cache.enabled="true" && \
# Enlarge EJB pools (cannot do this for server-config as set does not create new entries)
${ASADMIN} set default-config.ejb-container.max-pool-size="128" && \
# Misc settings
${ASADMIN} create-system-properties fish.payara.classloading.delegate="false" && \
${ASADMIN} create-system-properties jersey.config.client.readTimeout="300000" && \
${ASADMIN} create-system-properties jersey.config.client.connectTimeout="300000" && \

### DATAVERSE APPLICATION SPECIFICS
${ASADMIN} set-config-dir --directory=${SECRETS_DIR} && \
# TODO: what of the below 3 items can be deleted for container usage?
${ASADMIN} create-network-listener --protocol=http-listener-1 --listenerport=8009 --jkenabled=true jk-connector && \
${ASADMIN} set server-config.network-config.protocols.protocol.http-listener-1.http.comet-support-enabled=true && \
${ASADMIN} create-system-properties javax.xml.parsers.SAXParserFactory=com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl && \
# Always disable phoning home...
${ASADMIN} disable-phone-home && \

### CLEANUP
# Stop domain
${ASADMIN} stop-domain ${DOMAIN_NAME} && \
# Delete generated files
rm -rf \
/tmp/password-change-file.txt \
${PAYARA_DIR}/glassfish/domains/${DOMAIN_NAME}/osgi-cache \
Expand Down
16 changes: 1 addition & 15 deletions conf/container/scripts/app/init_2_conf_payara.sh
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,6 @@ fi
echo "INFO: Defining JavaMail."
echo "create-javamail-resource --mailhost=${MAIL_SERVER} --mailuser=dataversenotify --fromaddress=${MAIL_FROMADDRESS} mail/notifyMailSession" >> ${DV_POSTBOOT}

echo "INFO: defining miscellaneous configuration options."
# AJP connector
echo "create-network-listener --protocol=http-listener-1 --listenerport=8009 --jkenabled=true jk-connector" >> ${DV_POSTBOOT}
# COMET support
echo "set server-config.network-config.protocols.protocol.http-listener-1.http.comet-support-enabled=true" >> ${DV_POSTBOOT}
# SAX parser options
echo "create-system-properties javax.xml.parsers.SAXParserFactory=com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl" >> ${DV_POSTBOOT}

# 3. Domain based configuration options
# Set Dataverse environment variables
echo "INFO: Defining system properties for Dataverse configuration options."
Expand All @@ -93,13 +85,7 @@ env -0 | grep -z -Ee "^(dataverse|doi)_" | while IFS='=' read -r -d '' k v; do
echo "create-system-properties ${KEY}=${v}" >> ${DV_POSTBOOT}
done

# 4. Disable phone home. Always.
echo "disable-phone-home" >> ${DV_POSTBOOT}

# 5. Enable config dir for dealing with secrets etc.
echo "set-config-dir --directory=$SECRETS_DIR" >> ${DV_POSTBOOT}

# 6. Add the commands to the existing postboot file, but insert BEFORE deployment
# 4. Add the commands to the existing postboot file, but insert BEFORE deployment
echo "$(cat ${DV_POSTBOOT} | cat - ${POSTBOOT_COMMANDS} )" > ${POSTBOOT_COMMANDS}
echo "DEBUG: postboot contains the following commands:"
echo "--------------------------------------------------"
Expand Down

0 comments on commit c75b507

Please sign in to comment.