Date: Thursday, May 21, 2020 @ 16:54:52 Author: mtorromeo Revision: 631330
Fixed elasticsearch-env (FS#66726) Modified: elasticsearch/trunk/PKGBUILD elasticsearch/trunk/elasticsearch-env elasticsearch/trunk/elasticsearch-tmpfile.conf ----------------------------+ PKGBUILD | 6 +++--- elasticsearch-env | 8 +++++++- elasticsearch-tmpfile.conf | 1 + 3 files changed, 11 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-05-21 16:54:46 UTC (rev 631329) +++ PKGBUILD 2020-05-21 16:54:52 UTC (rev 631330) @@ -4,7 +4,7 @@ pkgname=elasticsearch pkgver=7.7.0 -pkgrel=1 +pkgrel=2 pkgdesc="Distributed RESTful search engine built on top of Lucene" arch=('x86_64') url="https://www.elastic.co/products/elasticsearch" @@ -23,7 +23,7 @@ elasticsearch.default ) sha256sums=('df2ba7e1991dd26f3dc14aa0cf6a90b0567ca5988636ab2a70bc9a12f9a7f6ef' - '830bf17a9e1f88a8d6152899af2674571ecace88e202e484b56bf24f67d96e10' + 'cf5a7723e029a1dea0e7c5891dd0694d4ec46b36525a1fdaa0be61b7d0ae40f5' '9e1f68ff275ef2b5f2b93d2823efc5cc9643da696fcbe09a3ea7520ada35ffba' '8a76ad9a44a34eca8d6cb7ec9d8f1b01d46c114765b0a76094de8d72f0477351' 'bac40d87acaa5bee209ceb6dfa253009a072e9243fe3b94be42fb5cd44727d6f' @@ -30,7 +30,7 @@ '22a78a165a810608188faea6f2b0b381f27b1e9d60126c3b3e729124540589a8' 'b3feb1e9c7e7ce6b33cea6c727728ed700332aae942ca475c3bcc1d56b9f113c' '815f6a39db6f54bb40750c382ffbdc298d2c4c187ee8ea7e2f855923e2ff354b' - '0a344d779c550de324bfda385896caf0d728563751c176127b63ebf2354abee0' + '05a73496766a869134cf8a73f2de552bcf9bd1b10a3257e2cbc15f476093c9a6' 'bb74e5fb8bc28f2125e015395ab05bea117b72bfc6dadbca827694b362ee0bf8') backup=('etc/elasticsearch/elasticsearch.yml' Modified: elasticsearch-env =================================================================== --- elasticsearch-env 2020-05-21 16:54:46 UTC (rev 631329) +++ elasticsearch-env 2020-05-21 16:54:52 UTC (rev 631330) @@ -38,8 +38,14 @@ echo "pass JVM parameters via ES_JAVA_OPTS" fi +if [[ "$("$JAVA" -version 2>/dev/null)" =~ "Unable to map CDS archive" ]]; then + XSHARE="-Xshare:off" +else + XSHARE="-Xshare:auto" +fi + # check the Java version -"$JAVA" -cp "$ES_CLASSPATH" org.elasticsearch.tools.java_version_checker.JavaVersionChecker +"$JAVA" "$XSHARE" -cp "$ES_CLASSPATH" org.elasticsearch.tools.java_version_checker.JavaVersionChecker export HOSTNAME=$HOSTNAME Modified: elasticsearch-tmpfile.conf =================================================================== --- elasticsearch-tmpfile.conf 2020-05-21 16:54:46 UTC (rev 631329) +++ elasticsearch-tmpfile.conf 2020-05-21 16:54:52 UTC (rev 631330) @@ -4,3 +4,4 @@ d /etc/elasticsearch 2750 - elasticsearch - d /etc/elasticsearch/scripts 0750 - elasticsearch - +d /etc/elasticsearch/jvm.options.d 0750 - elasticsearch -