Revert "Run solr via docker"

This reverts commit 037eed7.

Author: sk1p

test_haystack/solr_tests/server/get-solr-download-url.py

@@ -0,0 +1,65 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+from __future__ import absolute_import, division, print_function, unicode_literals
+
+import sys
+from itertools import chain
+
+import requests
+
+# Try to import urljoin from the Python 3 reorganized stdlib first:
+try:
+    from urllib.parse import urljoin
+except ImportError:
+    from urlparse import urljoin
+
+
+if len(sys.argv) != 2:
+    print("Usage: %s SOLR_VERSION" % sys.argv[0], file=sys.stderr)
+    sys.exit(1)
+
+solr_version = sys.argv[1]
+tarball = "solr-{0}.tgz".format(solr_version)
+dist_path = "lucene/solr/{0}/{1}".format(solr_version, tarball)
+
+download_url = urljoin("https://archive.apache.org/dist/", dist_path)
+mirror_response = requests.get(
+    "https://www.apache.org/dyn/mirrors/mirrors.cgi/%s?asjson=1" % dist_path
+)
+
+if not mirror_response.ok:
+    print(
+        "Apache mirror request returned HTTP %d" % mirror_response.status_code,
+        file=sys.stderr,
+    )
+    sys.exit(1)
+
+mirror_data = mirror_response.json()
+
+# Since the Apache mirrors are often unreliable and releases may disappear without notice we'll
+# try the preferred mirror, all of the alternates and backups, and fall back to the main Apache
+# archive server:
+for base_url in chain(
+    (mirror_data["preferred"],),
+    mirror_data["http"],
+    mirror_data["backup"],
+    ("https://archive.apache.org/dist/",),
+):
+    test_url = urljoin(base_url, mirror_data["path_info"])
+
+    # The Apache mirror script's response format has recently changed to exclude the actual file paths:
+    if not test_url.endswith(tarball):
+        test_url = urljoin(test_url, dist_path)
+
+    try:
+        if requests.head(test_url, allow_redirects=True).status_code == 200:
+            download_url = test_url
+            break
+    except requests.exceptions.ConnectionError:
+        continue
+else:
+    print("None of the Apache mirrors have %s" % dist_path, file=sys.stderr)
+    sys.exit(1)
+
+print(download_url)

test_haystack/solr_tests/server/solr-setup.sh

@@ -2,18 +2,73 @@
 
 set -e
 
-SOLR_VERSION=6.6.6
+SOLR_VERSION=6.6.4
+SOLR_DIR=solr
 
-if [ -z "${BACKGROUND_SOLR}" ]; then
-    ARGS=""
-else
-    ARGS="-d"
+
+SOLR_PORT=9001
+
+cd $(dirname $0)
+
+export TEST_ROOT=$(pwd)
+
+export SOLR_ARCHIVE="${SOLR_VERSION}.tgz"
+
+if [ -d "${HOME}/download-cache/" ]; then
+    export SOLR_ARCHIVE="${HOME}/download-cache/${SOLR_ARCHIVE}"
+fi
+
+if [ -f ${SOLR_ARCHIVE} ]; then
+    # If the tarball doesn't extract cleanly, remove it so it'll download again:
+    tar -tf ${SOLR_ARCHIVE} > /dev/null || rm ${SOLR_ARCHIVE}
 fi
 
-# https://stackoverflow.com/a/246128/540644
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+if [ ! -f ${SOLR_ARCHIVE} ]; then
+    SOLR_DOWNLOAD_URL=$(python get-solr-download-url.py $SOLR_VERSION)
+    curl -Lo $SOLR_ARCHIVE ${SOLR_DOWNLOAD_URL} || (echo "Unable to download ${SOLR_DOWNLOAD_URL}"; exit 2)
+fi
+
+echo "Extracting Solr ${SOLR_ARCHIVE} to ${TEST_ROOT}/${SOLR_DIR}"
+rm -rf ${SOLR_DIR}
+mkdir ${SOLR_DIR}
+FULL_SOLR_DIR=$(readlink -f ./${SOLR_DIR})
+tar -C ${SOLR_DIR} -xf ${SOLR_ARCHIVE} --strip-components=1
+
+# These tuning options will break on Java 10 and for testing we don't care about
+# production server optimizations:
+export GC_LOG_OPTS=""
+export GC_TUNE=""
 
-docker run --rm ${ARGS} -p 9001:8983 \
-    -v $DIR/solr-setup.sh:/solr-setup.sh \
-    -v $DIR/confdir:/confdir:ro \
-    --name haystack_solr solr:${SOLR_VERSION}-slim bash -c "/solr-setup.sh"
+export SOLR_LOGS_DIR="${FULL_SOLR_DIR}/logs"
+
+install -d ${SOLR_LOGS_DIR}
+
+echo "Changing into ${FULL_SOLR_DIR} "
+
+cd ${FULL_SOLR_DIR}
+
+echo "Creating Solr Core"
+./bin/solr start -p ${SOLR_PORT}
+./bin/solr create -c collection1 -p ${SOLR_PORT} -n basic_config
+./bin/solr create -c mgmnt -p ${SOLR_PORT}
+
+echo "Solr system information:"
+curl --fail --silent 'http://localhost:9001/solr/admin/info/system?wt=json&indent=on' | python -m json.tool
+./bin/solr stop -p ${SOLR_PORT}
+
+CONF_DIR=${TEST_ROOT}/confdir
+CORE_DIR=${FULL_SOLR_DIR}/server/solr/collection1
+mv ${CORE_DIR}/conf/managed-schema ${CORE_DIR}/conf/managed-schema.old
+cp ${CONF_DIR}/* ${CORE_DIR}/conf/
+
+echo 'Starting server'
+cd server
+# We use exec to allow process monitors to correctly kill the
+# actual Java process rather than this launcher script:
+export CMD="java -Djetty.port=${SOLR_PORT} -Djava.awt.headless=true -Dapple.awt.UIElement=true -jar start.jar --module=http -Dsolr.install.dir=${FULL_SOLR_DIR} -Dsolr.log.dir=${SOLR_LOGS_DIR}"
+
+if [ -z "${BACKGROUND_SOLR}" ]; then
+    exec $CMD
+else
+    exec $CMD >/dev/null &
+fi