fixed --size bug

Author: Configuration Manager

CHANGELOG.md

@@ -5,6 +5,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [unreleased]
 
+## [2.1.4]
+
+### Fixed
+
+- JAVA_OPTS management
 
 ## [2.1.3]
 

Dockerfile

@@ -18,22 +18,23 @@ ENV SDAAS_STORE_NAME=rdfStore
 ENV SDAAS_STORE_LOG=/var/log/${SDAAS_STORE_NAME}
 ENV SDAAS_STORE_WAR=/opt/${SDAAS_STORE_NAME}
 ENV SDAAS_STORE_DATA=/var/lib/${SDAAS_STORE_NAME}
+ENV SDAAS_STORE_ETC=/etc/${SDAAS_STORE_NAME}
 
 ####### Create dirs
-RUN mkdir -p "${SDAAS_STORE_WAR}" "${SDAAS_STORE_DATA}" "${SDAAS_STORE_LOG}" ; \
-	chown -R jetty.jetty "${SDAAS_STORE_WAR}" "${SDAAS_STORE_DATA}" "${SDAAS_STORE_LOG}" 
+RUN mkdir -p "${SDAAS_STORE_WAR}" "${SDAAS_STORE_DATA}" "${SDAAS_STORE_LOG}" "${SDAAS_STORE_ETC}" ; \
+	chown -R jetty.jetty "${SDAAS_STORE_DATA}" "${SDAAS_STORE_LOG}" 
 
-####### Install war
+
+####### Configure the override template for war.xml 
+COPY helpers/readonly-template.xml "${SDAAS_STORE_ETC}/readonly-template.xml"
+
+####### Install war and default override
 COPY --from=build-stage /sdaas ${SDAAS_STORE_WAR}
 COPY helpers/sdaas-template.xml ${JETTY_BASE}/webapps/sdaas.xml
-RUN sed -i \
-		-e "s|__SDAAS_STORE_WAR__|${SDAAS_STORE_WAR}|g" \
-	"${JETTY_BASE}/webapps/sdaas.xml" ; \
-	chown jetty.jetty "${JETTY_BASE}/webapps/sdaas.xml"
+RUN sed -i -e "s|__SDAAS_STORE_WAR__|${SDAAS_STORE_WAR}|g" "${JETTY_BASE}/webapps/sdaas.xml" ; \
+	sed 's/__READONLY__/true/' "${SDAAS_STORE_ETC}/readonly-template.xml"  > "${JETTY_BASE}/readonly-override.xml" ;\
+	chown jetty.jetty "${JETTY_BASE}/webapps/sdaas.xml" "${JETTY_BASE}/readonly-override.xml"
 
-####### Configure the override template for war.xml 
-COPY helpers/readonly-template.xml "${JETTY_BASE}/readonly-template.xml"
-RUN chown jetty.jetty "${JETTY_BASE}/readonly-template.xml" 
 
 ####### Configure RWStore.properties file
 RUN sed "s|^com\.bigdata.journal\.AbstractJournal\.file=.*|com.bigdata.journal.AbstractJournal.file=${SDAAS_STORE_DATA}/${SDAAS_STORE_NAME}.jnl|" \
@@ -47,7 +48,6 @@ COPY helpers/sdaas-st* /
 RUN chown jetty.jetty /sdaas-st* ; \
 	chmod +rx /sdaas-st* 
 
-
 
 USER jetty
 ENTRYPOINT ["/sdaas-start"]

README.md

@@ -11,20 +11,21 @@ The sdaas-rdfstore requires [docker](https://www.docker.com/)
 	docker build -t sdaas-rdfstore .
 
 ## Smoke tests
+
+*Note on windows user: define `export MSYS_NO_PATHCONV=1` to avoid unwanted path conversion [see this note](https://stackoverflow.com/questions/7250130/how-to-stop-mingw-and-msys-from-mangling-path-names-given-at-the-command-line#34386471)*
 
-	docker run --rm -ti --entrypoint bash sdaas-rdfstore
-	/sdaas-start -d --size small --readonly || echo KO
-	sleep 10 # some time to warmup
-	test -f /var/log/rdfStore/rdfStore.log || echo KO
-	test -f /var/lib/rdfStore/rdfStore.jnl || echo KO
-	/sdaas-stop || echo KO
-	exit
-	
-	docker run --name gdaas -d -p 8080:8080 sdaas-rdfstore
-	docker logs -f gdaas
-	# point browser to http://localhost:8080/sdaas to see workbench interface
-	#..press ctrl-c to exit logs
-	docker rm -f gdaas
+	docker run -d --name rdfstore -p 8080:8080 sdaas-rdfstore
+	sleep 10;docker exec rdfstore test -f /var/lib/rdfStore/rdfStore.jnl || echo KO
+	curl -X POST \
+		--data-binary "LOAD <http://wifo5-03.informatik.uni-mannheim.de/benchmarks-200801/homepages-fixed.nt.gz>" \
+		--header "Content-Type: application/sparql-update" \
+		http://localhost:8080/sdaas/sparql  || echo KO
+
+Test workbench:
+
+- point browser to http://localhost:8080/sdaas to see workbench interface
+- in the UPDATE tab, tray executing: `DROP ALL; LOAD <http://wifo5-03.informatik.uni-mannheim.de/benchmarks-200801/homepages-fixed.nt.gz>`
+- free docker resource typing `docker rm -f rdfstore`
 
 ## sdaas-start options
 
@@ -48,30 +49,29 @@ memory footprints and performances related to size:
 
 | size value       | required RAM | edges (triples) |
 |------------------|--------------|-----------------|
-| micro (default)  | 512MB        | <200K           |
-| small            | 2GB          | <1M             |
-| medium           | 4GB          | <8M             |
-| large            | 8GB          | <100M           |
-| xlarge           | 16GB         | <500M           |
-| xxlarge          | 32GB         | <1B             |
+| micro (default)  | 512M         | <200K           |
+| small            | 2GB          | <5M             |
+| medium           | 4GB          | <10M            |
+| large            | 8GB          | <50M            |
+| xlarge           | 16GB         | <100M           |
+| xxlarge          | 32GB         | <500M           |
 | custom           | depends      |                 |
 
 
 The *micro* size is suitable for test and development environment.
 
 The *custom* size let to you setting up proper configurations, see https://github.com/blazegraph/database/wiki/Hardware_Configuration
 
-To persist data and improve performances, you should mount as a fast volume the directory /var/lib/sdaas
+To persist data and improve performances, you should mount as a fast volume the directory /var/lib/rdfStore
 
 
 
 ## Push to docker hub
 
 To push a new docker image to docker hub:
 
-```
-docker build -t linkeddatacenter/sdaas-rdfstore .
-docker login
-docker tag linkeddatacenter/sdaas-rdfstore linkeddatacenter/sdaas-rdfstore:x.x.x
-docker push linkeddatacenter/sdaas-rdfstore
-```
+	docker login
+	docker build -t linkeddatacenter/sdaas-rdfstore .
+	docker tag linkeddatacenter/sdaas-rdfstore linkeddatacenter/sdaas-rdfstore:x.x.x
+	docker push linkeddatacenter/sdaas-rdfstore
+

helpers/sdaas-start

@@ -12,7 +12,8 @@ _FOREGROUND=1
 _READONLY=0
 _SIZE=micro
 _LOGDIR="${SDAAS_STORE_LOG:-"$JETTY_BASE"}"
-_STORENAME="${SDAAS_STORE_NAME:-storeDb}"
+_STORENAME="${SDAAS_STORE_NAME:-rdfStore}"
+_ETC="${SDAAS_STORE_ETC:-"/etc/$_STORENAME"}"
 
 
 
@@ -67,19 +68,19 @@ case "$_SIZE" in
     	JAVA_OPTS="-server -Xmx256m -Djava.awt.headless=true"
     	;;
     small)
-    	JAVA_OPTS="-server -Xmx1500m -Djava.awt.headless=true"
+    	JAVA_OPTS="-server -Xmx1g -Djava.awt.headless=true"
     	;;
     medium)
-    	JAVA_OPTS="-server -Xmx3500m -Djava.awt.headless=true -XX:+UseG1GC"
+    	JAVA_OPTS="-server -XX:+UseG1GC -Xmx2g -Djava.awt.headless=true "
     	;;
 	large)
-    	JAVA_OPTS="-server -Xmx7g -Djava.awt.headless=true -XX:MaxDirectMemorySize=3000m  -XX:+UseG1GC"
+    	JAVA_OPTS="-server -XX:+UseG1GC -Xmx4g -Djava.awt.headless=true"
     	;;
 	xlarge)
-    	JAVA_OPTS="-server -Xmx15g -Djava.awt.headless=true -XX:MaxDirectMemorySize=3000m -XX:+UseG1GC"
+    	JAVA_OPTS="-server -XX:+UseG1GC -Xmx8g -Djava.awt.headless=true"
     	;;
 	xxlarge)
-    	JAVA_OPTS="-server -Xmx30g -Djava.awt.headless=true -XX:MaxDirectMemorySize=3000m -XX:+UseG1GC"
+    	JAVA_OPTS="-server -XX:+UseG1GC -Xmx16g -Djava.awt.headless=true"
     	;;
     custom)
     	;;
@@ -92,14 +93,14 @@ esac
 startupMsg="SDaaS knowledge graph engine starting using $_SIZE memory footprint"
 
 if [  $_READONLY -eq 1 ]; then 
-	sed 's/__READONLY__/true/' "${JETTY_BASE}/readonly-template.xml"  > "${JETTY_BASE}/readonly-override.xml"
+	sed 's/__READONLY__/true/' "${SDAAS_STORE_ETC}/readonly-template.xml"  > "${JETTY_BASE}/readonly-override.xml"
 	startupMsg="READONLY - $startupMsg"
 else
-	sed 's/__READONLY__/false/' "${JETTY_BASE}/readonly-template.xml" > "${JETTY_BASE}/readonly-override.xml"
+	sed 's/__READONLY__/false/' "${SDAAS_STORE_ETC}/readonly-template.xml" > "${JETTY_BASE}/readonly-override.xml"
 fi
 
 
-_STARTUP_CMD="java -jar "${JETTY_HOME}/start.jar" STOP.PORT=28282 STOP.KEY=secret"
+_STARTUP_CMD="java ${JAVA_OPTS:-''} -jar "${JETTY_HOME}/start.jar" STOP.PORT=28282 STOP.KEY=secret"
 if [ $_FOREGROUND -eq 1 ]; then
 	echo "${startupMsg}. Press ctrl-c to stop."
 	cd "${JETTY_BASE}" &&  $_STARTUP_CMD