Hedonil has uploaded a new change for review. https://gerrit.wikimedia.org/r/148977
Change subject: webserviće: Bug: 68431, Bug: 68499 - allow setting individual tools memory limits via config files in /data/project/.system/config - create blank .lighttpd.conf, if it doesn't exist ...................................................................... webserviće: Bug: 68431, Bug: 68499 - allow setting individual tools memory limits via config files in /data/project/.system/config - create blank .lighttpd.conf, if it doesn't exist Change-Id: I9d5a3769eabc0c0925ab7ade2ae462f058fc5884 --- M misctools/webservice 1 file changed, 9 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs refs/changes/77/148977/1 diff --git a/misctools/webservice b/misctools/webservice index cd57748..d35ef08 100755 --- a/misctools/webservice +++ b/misctools/webservice @@ -6,6 +6,11 @@ server="lighttpd" public="public_html" +memlimit=4g +if [ -r "/data/project/.system/config/$tool.web-memlimit" ]; then + memlimit=$(cat "/data/project/.system/config/$tool.web-memlimit") +fi + case "$1" in -tomcat) server="tomcat" @@ -32,6 +37,8 @@ exit 1 fi +touch -a "$home/.lighttpd.conf" + job=$(qstat -q "webgrid-$server" -j "$server-$tool" 2>&1 | grep job_number: | sed -e 's/^.* *\(.*\)$/\1/') if [ "$job" != "" ]; then si=$(qstat -j "$job" 2>&1 | grep 'scheduling info': | sed -e 's/^.*: *\(.*\)$/\1/') @@ -53,7 +60,7 @@ if [ "$job" != "" ]; then echo "Webservice already running." else - if qsub -e $home/error.log -o $home/error.log -i /dev/null -q "webgrid-$server" -l h_vmem=4g -b y -N "$server-$tool" /usr/local/bin/tool-$server >/dev/null 2>&1 ; then + if qsub -e $home/error.log -o $home/error.log -i /dev/null -q "webgrid-$server" -l h_vmem=$memlimit -b y -N "$server-$tool" /usr/local/bin/tool-$server >/dev/null 2>&1 ; then echo " started." else echo " failed." @@ -69,7 +76,7 @@ else echo -n . fi - if qsub -e $home/error.log -o /dev/null -i /dev/null -q "webgrid-$server" -l h_vmem=4g -b y -N "$server-$tool" /usr/local/bin/tool-$server >/dev/null 2>&1; then + if qsub -e $home/error.log -o /dev/null -i /dev/null -q "webgrid-$server" -l h_vmem=$memlimit -b y -N "$server-$tool" /usr/local/bin/tool-$server >/dev/null 2>&1; then echo " restarted." else echo " failed." @@ -107,4 +114,3 @@ exit 1 ;; esac - -- To view, visit https://gerrit.wikimedia.org/r/148977 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9d5a3769eabc0c0925ab7ade2ae462f058fc5884 Gerrit-PatchSet: 1 Gerrit-Project: labs/toollabs Gerrit-Branch: master Gerrit-Owner: Hedonil <hedo...@action.ms> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits