From 5cc0172d570c6257630d37c0a6d31c162ecd8da5 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Mon, 10 Feb 2020 12:01:14 +0100 Subject: [PATCH 1/9] Move conf/solr from 7.3.1 to 7.7.2 --- conf/solr/{7.3.1 => 7.7.2}/readme.md | 0 conf/solr/{7.3.1 => 7.7.2}/schema.xml | 0 conf/solr/{7.3.1 => 7.7.2}/schema_dv_mdb_copies.xml | 0 conf/solr/{7.3.1 => 7.7.2}/schema_dv_mdb_fields.xml | 0 conf/solr/{7.3.1 => 7.7.2}/solrconfig.xml | 0 conf/solr/{7.3.1 => 7.7.2}/updateSchemaMDB.sh | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename conf/solr/{7.3.1 => 7.7.2}/readme.md (100%) rename conf/solr/{7.3.1 => 7.7.2}/schema.xml (100%) rename conf/solr/{7.3.1 => 7.7.2}/schema_dv_mdb_copies.xml (100%) rename conf/solr/{7.3.1 => 7.7.2}/schema_dv_mdb_fields.xml (100%) rename conf/solr/{7.3.1 => 7.7.2}/solrconfig.xml (100%) rename conf/solr/{7.3.1 => 7.7.2}/updateSchemaMDB.sh (100%) diff --git a/conf/solr/7.3.1/readme.md b/conf/solr/7.7.2/readme.md similarity index 100% rename from conf/solr/7.3.1/readme.md rename to conf/solr/7.7.2/readme.md diff --git a/conf/solr/7.3.1/schema.xml b/conf/solr/7.7.2/schema.xml similarity index 100% rename from conf/solr/7.3.1/schema.xml rename to conf/solr/7.7.2/schema.xml diff --git a/conf/solr/7.3.1/schema_dv_mdb_copies.xml b/conf/solr/7.7.2/schema_dv_mdb_copies.xml similarity index 100% rename from conf/solr/7.3.1/schema_dv_mdb_copies.xml rename to conf/solr/7.7.2/schema_dv_mdb_copies.xml diff --git a/conf/solr/7.3.1/schema_dv_mdb_fields.xml b/conf/solr/7.7.2/schema_dv_mdb_fields.xml similarity index 100% rename from conf/solr/7.3.1/schema_dv_mdb_fields.xml rename to conf/solr/7.7.2/schema_dv_mdb_fields.xml diff --git a/conf/solr/7.3.1/solrconfig.xml b/conf/solr/7.7.2/solrconfig.xml similarity index 100% rename from conf/solr/7.3.1/solrconfig.xml rename to conf/solr/7.7.2/solrconfig.xml diff --git a/conf/solr/7.3.1/updateSchemaMDB.sh b/conf/solr/7.7.2/updateSchemaMDB.sh similarity index 100% rename from conf/solr/7.3.1/updateSchemaMDB.sh rename to conf/solr/7.7.2/updateSchemaMDB.sh From ce38fa86671fe4c51864c882605b0fe21570c245 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Mon, 10 Feb 2020 12:02:57 +0100 Subject: [PATCH 2/9] Update Makefile for releases to use new Solr 7.7.2 --- scripts/installer/Makefile | 8 ++++---- scripts/installer/README.txt | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/installer/Makefile b/scripts/installer/Makefile index f9a933e5c81..c4082cce6e2 100644 --- a/scripts/installer/Makefile +++ b/scripts/installer/Makefile @@ -71,15 +71,15 @@ ${JHOVE_SCHEMA}: ../../conf/jhove/jhoveConfig.xsd @mkdir -p ${INSTALLER_ZIP_DIR} /bin/cp ../../conf/jhove/jhoveConfig.xsd ${INSTALLER_ZIP_DIR} -${SOLR_SCHEMA}: ../../conf/solr/7.3.1/schema.xml ../../conf/solr/7.3.1/schema_dv_mdb_fields.xml ../../conf/solr/7.3.1/schema_dv_mdb_copies.xml ../../conf/solr/7.3.1/updateSchemaMDB.sh +${SOLR_SCHEMA}: ../../conf/solr/7.7.2/schema.xml ../../conf/solr/7.7.2/schema_dv_mdb_fields.xml ../../conf/solr/7.7.2/schema_dv_mdb_copies.xml ../../conf/solr/7.7.2/updateSchemaMDB.sh @echo copying Solr schema file @mkdir -p ${INSTALLER_ZIP_DIR} - /bin/cp ../../conf/solr/7.3.1/schema*.xml ../../conf/solr/7.3.1/updateSchemaMDB.sh ${INSTALLER_ZIP_DIR} + /bin/cp ../../conf/solr/7.7.2/schema*.xml ../../conf/solr/7.7.2/updateSchemaMDB.sh ${INSTALLER_ZIP_DIR} -${SOLR_CONFIG}: ../../conf/solr/7.3.1/solrconfig.xml +${SOLR_CONFIG}: ../../conf/solr/7.7.2/solrconfig.xml @echo copying Solr config file @mkdir -p ${INSTALLER_ZIP_DIR} - /bin/cp ../../conf/solr/7.3.1/solrconfig.xml ${INSTALLER_ZIP_DIR} + /bin/cp ../../conf/solr/7.7.2/solrconfig.xml ${INSTALLER_ZIP_DIR} ${PYTHON_FILES}: README_python.txt install.py installConfig.py installGlassfish.py installUtils.py requirements.txt default.config interactive.config @echo copying Python installer files diff --git a/scripts/installer/README.txt b/scripts/installer/README.txt index 4407f179be0..81328b89ccd 100644 --- a/scripts/installer/README.txt +++ b/scripts/installer/README.txt @@ -40,7 +40,7 @@ from conf/jhove: jhove.conf -SOLR schema and config files, from conf/solr/7.3.1: +SOLR schema and config files, from conf/solr/7.7.2: schema.xml schema_dv_cmb_copies.xml From 622b1ec6675864d501c56e45ab991baa58005374 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Mon, 10 Feb 2020 12:03:38 +0100 Subject: [PATCH 3/9] Update guides with new Solr 7.7.2 --- .../_static/installation/files/etc/init.d/solr | 2 +- .../files/etc/systemd/solr.service | 6 +++--- .../source/admin/metadatacustomization.rst | 6 +++--- .../source/developers/dev-environment.rst | 18 +++++++++--------- .../source/installation/prerequisites.rst | 14 +++++++------- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/doc/sphinx-guides/source/_static/installation/files/etc/init.d/solr b/doc/sphinx-guides/source/_static/installation/files/etc/init.d/solr index 6c89c27f5f7..d351c544a65 100755 --- a/doc/sphinx-guides/source/_static/installation/files/etc/init.d/solr +++ b/doc/sphinx-guides/source/_static/installation/files/etc/init.d/solr @@ -5,7 +5,7 @@ # chkconfig: 35 92 08 # description: Starts and stops Apache Solr -SOLR_DIR="/usr/local/solr/solr-7.3.1" +SOLR_DIR="/usr/local/solr/solr-7.7.2" SOLR_COMMAND="bin/solr" SOLR_ARGS="-m 1g -j jetty.host=127.0.0.1" SOLR_USER=solr diff --git a/doc/sphinx-guides/source/_static/installation/files/etc/systemd/solr.service b/doc/sphinx-guides/source/_static/installation/files/etc/systemd/solr.service index 84f1d22c517..06eacc68ca2 100644 --- a/doc/sphinx-guides/source/_static/installation/files/etc/systemd/solr.service +++ b/doc/sphinx-guides/source/_static/installation/files/etc/systemd/solr.service @@ -5,9 +5,9 @@ After = syslog.target network.target remote-fs.target nss-lookup.target [Service] User = solr Type = forking -WorkingDirectory = /usr/local/solr/solr-7.3.1 -ExecStart = /usr/local/solr/solr-7.3.1/bin/solr start -m 1g -j "jetty.host=127.0.0.1" -ExecStop = /usr/local/solr/solr-7.3.1/bin/solr stop +WorkingDirectory = /usr/local/solr/solr-7.7.2 +ExecStart = /usr/local/solr/solr-7.7.2/bin/solr start -m 1g -j "jetty.host=127.0.0.1" +ExecStop = /usr/local/solr/solr-7.7.2/bin/solr stop LimitNOFILE=65000 LimitNPROC=65000 Restart=on-failure diff --git a/doc/sphinx-guides/source/admin/metadatacustomization.rst b/doc/sphinx-guides/source/admin/metadatacustomization.rst index 3f46b03d395..bf89805007b 100644 --- a/doc/sphinx-guides/source/admin/metadatacustomization.rst +++ b/doc/sphinx-guides/source/admin/metadatacustomization.rst @@ -620,7 +620,7 @@ configuration, including any enabled metadata schemas: ``curl http://localhost:8080/api/admin/index/solr/schema`` -For convenience and automation you can download and consider running :download:`updateSchemaMDB.sh <../../../../conf/solr/7.3.1/updateSchemaMDB.sh>`. It uses the API endpoint above and writes schema files to the filesystem (so be sure to run it on the Solr server itself as the Unix user who owns the Solr files) and then triggers a Solr reload. +For convenience and automation you can download and consider running :download:`updateSchemaMDB.sh <../../../../conf/solr/7.7.2/updateSchemaMDB.sh>`. It uses the API endpoint above and writes schema files to the filesystem (so be sure to run it on the Solr server itself as the Unix user who owns the Solr files) and then triggers a Solr reload. By default, it will download from Dataverse at `http://localhost:8080` and reload Solr at `http://localhost:8983`. You may use the following environment variables with this script or mix'n'match with options: @@ -633,13 +633,13 @@ Environment variable Option Description E `UNBLOCK_KEY` `-u` If your installation has a blocked admin API *xyz* or */secrets/unblock.key* endpoint, you can provide either the key itself or a path to a keyfile -`TARGET` `-t` Provide the config directory of your Solr core */usr/local/solr/solr-7.3.1/server/solr/collection1/conf* +`TARGET` `-t` Provide the config directory of your Solr core */usr/local/solr/solr-7.7.2/server/solr/collection1/conf* "collection1" ==================== ====== =============================================== ========================================================= See the :doc:`/installation/prerequisites/` section of the Installation Guide for a suggested location on disk for the Solr schema file. -Please note that if you are going to make a pull request updating ``conf/solr/7.3.1/schema.xml`` with fields you have added, you should first load all the custom metadata blocks in ``scripts/api/data/metadatablocks`` (including ones you don't care about) to create a complete list of fields. +Please note that if you are going to make a pull request updating ``conf/solr/7.7.2/schema.xml`` with fields you have added, you should first load all the custom metadata blocks in ``scripts/api/data/metadatablocks`` (including ones you don't care about) to create a complete list of fields. Reloading a Metadata Block -------------------------- diff --git a/doc/sphinx-guides/source/developers/dev-environment.rst b/doc/sphinx-guides/source/developers/dev-environment.rst index 5ef6eba04ae..e7babf75b34 100755 --- a/doc/sphinx-guides/source/developers/dev-environment.rst +++ b/doc/sphinx-guides/source/developers/dev-environment.rst @@ -131,7 +131,7 @@ On Linux, you should just install PostgreSQL from your package manager without w Install Solr ~~~~~~~~~~~~ -`Solr `_ 7.3.1 is required. +`Solr `_ 7.7.2 is required. To install Solr, execute the following commands: @@ -141,27 +141,27 @@ To install Solr, execute the following commands: ``cd /usr/local/solr`` -``curl -O http://archive.apache.org/dist/lucene/solr/7.3.1/solr-7.3.1.tgz`` +``curl -O http://archive.apache.org/dist/lucene/solr/7.7.2/solr-7.7.2.tgz`` -``tar xvfz solr-7.3.1.tgz`` +``tar xvfz solr-7.7.2.tgz`` -``cd solr-7.3.1/server/solr`` +``cd solr-7.7.2/server/solr`` ``cp -r configsets/_default collection1`` -``curl -O https://raw.githubusercontent.com/IQSS/dataverse/develop/conf/solr/7.3.1/schema.xml`` +``curl -O https://raw.githubusercontent.com/IQSS/dataverse/develop/conf/solr/7.7.2/schema.xml`` -``curl -O https://raw.githubusercontent.com/IQSS/dataverse/develop/conf/solr/7.3.1/schema_dv_mdb_fields.xml`` +``curl -O https://raw.githubusercontent.com/IQSS/dataverse/develop/conf/solr/7.7.2/schema_dv_mdb_fields.xml`` -``curl -O https://raw.githubusercontent.com/IQSS/dataverse/develop/conf/solr/7.3.1/schema_dv_mdb_copies.xml`` +``curl -O https://raw.githubusercontent.com/IQSS/dataverse/develop/conf/solr/7.7.2/schema_dv_mdb_copies.xml`` ``mv schema*.xml collection1/conf`` -``curl -O https://raw.githubusercontent.com/IQSS/dataverse/develop/conf/solr/7.3.1/solrconfig.xml`` +``curl -O https://raw.githubusercontent.com/IQSS/dataverse/develop/conf/solr/7.7.2/solrconfig.xml`` ``mv solrconfig.xml collection1/conf/solrconfig.xml`` -``cd /usr/local/solr/solr-7.3.1`` +``cd /usr/local/solr/solr-7.7.2`` (Please note that the extra jetty argument below is a security measure to limit connections to Solr to only your computer. For extra security, run a firewall.) diff --git a/doc/sphinx-guides/source/installation/prerequisites.rst b/doc/sphinx-guides/source/installation/prerequisites.rst index 19d52835a44..11792e6f56a 100644 --- a/doc/sphinx-guides/source/installation/prerequisites.rst +++ b/doc/sphinx-guides/source/installation/prerequisites.rst @@ -201,19 +201,19 @@ Become the ``solr`` user and then download and configure Solr:: su - solr cd /usr/local/solr - wget https://archive.apache.org/dist/lucene/solr/7.3.1/solr-7.3.1.tgz - tar xvzf solr-7.3.1.tgz - cd solr-7.3.1 + wget https://archive.apache.org/dist/lucene/solr/7.7.2/solr-7.7.2.tgz + tar xvzf solr-7.7.2.tgz + cd solr-7.7.2 cp -r server/solr/configsets/_default server/solr/collection1 You should already have a "dvinstall.zip" file that you downloaded from https://github.com/IQSS/dataverse/releases . Unzip it into ``/tmp``. Then copy the files into place:: - cp /tmp/dvinstall/schema*.xml /usr/local/solr/solr-7.3.1/server/solr/collection1/conf - cp /tmp/dvinstall/solrconfig.xml /usr/local/solr/solr-7.3.1/server/solr/collection1/conf + cp /tmp/dvinstall/schema*.xml /usr/local/solr/solr-7.7.2/server/solr/collection1/conf + cp /tmp/dvinstall/solrconfig.xml /usr/local/solr/solr-7.7.2/server/solr/collection1/conf Note: Dataverse has customized Solr to boost results that come from certain indexed elements inside Dataverse, for example prioritizing results from Dataverses over Datasets. If you would like to remove this, edit your ``solrconfig.xml`` and remove the ```` element and its contents. If you have ideas about how this boosting could be improved, feel free to contact us through our Google Group https://groups.google.com/forum/#!forum/dataverse-dev . -Dataverse requires a change to the ``jetty.xml`` file that ships with Solr. Edit ``/usr/local/solr/solr-7.3.1/server/etc/jetty.xml`` , increasing ``requestHeaderSize`` from ``8192`` to ``102400`` +Dataverse requires a change to the ``jetty.xml`` file that ships with Solr. Edit ``/usr/local/solr/solr-7.7.2/server/etc/jetty.xml`` , increasing ``requestHeaderSize`` from ``8192`` to ``102400`` Solr will warn about needing to increase the number of file descriptors and max processes in a production environment but will still run with defaults. We have increased these values to the recommended levels by adding ulimit -n 65000 to the init script, and the following to ``/etc/security/limits.conf``:: @@ -232,7 +232,7 @@ Solr launches asynchronously and attempts to use the ``lsof`` binary to watch fo Finally, you need to tell Solr to create the core "collection1" on startup: - echo "name=collection1" > /usr/local/solr/solr-7.3.1/server/solr/collection1/core.properties + echo "name=collection1" > /usr/local/solr/solr-7.7.2/server/solr/collection1/core.properties Solr Init Script ================ From 38d9067849a86878ef093bcc6e661d0300e44e49 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Mon, 10 Feb 2020 12:04:27 +0100 Subject: [PATCH 4/9] Update POM to use java library in version matching server component (7.7.2) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7836df54819..4f44be730ba 100644 --- a/pom.xml +++ b/pom.xml @@ -314,7 +314,7 @@ org.apache.solr solr-solrj - 7.3.1 + 7.7.2 org.apache.commons From a2c19937a6dcfd37681f3a42db62b08fb5b7d615 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Mon, 10 Feb 2020 12:05:18 +0100 Subject: [PATCH 5/9] Update Jenkins integration testing to use new Solr 7.7.2 --- tests/jenkins/groupvars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/jenkins/groupvars.yml b/tests/jenkins/groupvars.yml index a32be3e5d41..e8cf2d0bd6e 100644 --- a/tests/jenkins/groupvars.yml +++ b/tests/jenkins/groupvars.yml @@ -112,7 +112,7 @@ dataverse: group: solr root: /usr/local/solr user: solr - version: 7.3.1 + version: 7.7.2 srcdir: /tmp/dataverse thumbnails: true unittests: From aa9c36eb0d8c5fb3dabd9e2134899d9a50e24765 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Mon, 10 Feb 2020 12:05:43 +0100 Subject: [PATCH 6/9] Update Vagrant method with Solr 7.7.2 --- downloads/download.sh | 2 +- scripts/vagrant/setup-solr.sh | 12 ++++++------ scripts/vagrant/setup.sh | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/downloads/download.sh b/downloads/download.sh index 8290afd61f7..a9bdc12c40b 100755 --- a/downloads/download.sh +++ b/downloads/download.sh @@ -1,5 +1,5 @@ #!/bin/sh curl -L -O http://download.java.net/glassfish/4.1/release/glassfish-4.1.zip -curl -L -O https://archive.apache.org/dist/lucene/solr/7.3.1/solr-7.3.1.tgz +curl -L -O https://archive.apache.org/dist/lucene/solr/7.7.2/solr-7.7.2.tgz curl -L -O https://search.maven.org/remotecontent?filepath=org/jboss/weld/weld-osgi-bundle/2.2.10.Final/weld-osgi-bundle-2.2.10.Final-glassfish4.jar curl -s -L http://sourceforge.net/projects/schemaspy/files/schemaspy/SchemaSpy%205.0.0/schemaSpy_5.0.0.jar/download > schemaSpy_5.0.0.jar diff --git a/scripts/vagrant/setup-solr.sh b/scripts/vagrant/setup-solr.sh index a97924412f9..ec3af6bf454 100755 --- a/scripts/vagrant/setup-solr.sh +++ b/scripts/vagrant/setup-solr.sh @@ -4,12 +4,12 @@ SOLR_USER=solr SOLR_HOME=/usr/local/solr mkdir $SOLR_HOME chown $SOLR_USER:$SOLR_USER $SOLR_HOME -su $SOLR_USER -s /bin/sh -c "cp /downloads/solr-7.3.1.tgz $SOLR_HOME" -su $SOLR_USER -s /bin/sh -c "cd $SOLR_HOME && tar xfz solr-7.3.1.tgz" -su $SOLR_USER -s /bin/sh -c "cd $SOLR_HOME/solr-7.3.1/server/solr && cp -r configsets/_default . && mv _default collection1" -su $SOLR_USER -s /bin/sh -c "cp /conf/solr/7.3.1/schema*.xml $SOLR_HOME/solr-7.3.1/server/solr/collection1/conf/" -su $SOLR_USER -s /bin/sh -c "cp /conf/solr/7.3.1/solrconfig.xml $SOLR_HOME/solr-7.3.1/server/solr/collection1/conf/solrconfig.xml" -su $SOLR_USER -s /bin/sh -c "cd $SOLR_HOME/solr-7.3.1 && bin/solr start && bin/solr create_core -c collection1 -d server/solr/collection1/conf/" +su $SOLR_USER -s /bin/sh -c "cp /downloads/solr-7.7.2.tgz $SOLR_HOME" +su $SOLR_USER -s /bin/sh -c "cd $SOLR_HOME && tar xfz solr-7.7.2.tgz" +su $SOLR_USER -s /bin/sh -c "cd $SOLR_HOME/solr-7.7.2/server/solr && cp -r configsets/_default . && mv _default collection1" +su $SOLR_USER -s /bin/sh -c "cp /conf/solr/7.7.2/schema*.xml $SOLR_HOME/solr-7.7.2/server/solr/collection1/conf/" +su $SOLR_USER -s /bin/sh -c "cp /conf/solr/7.7.2/solrconfig.xml $SOLR_HOME/solr-7.7.2/server/solr/collection1/conf/solrconfig.xml" +su $SOLR_USER -s /bin/sh -c "cd $SOLR_HOME/solr-7.7.2 && bin/solr start && bin/solr create_core -c collection1 -d server/solr/collection1/conf/" cp /dataverse/doc/sphinx-guides/source/_static/installation/files/etc/init.d/solr /etc/init.d/solr chmod 755 /etc/init.d/solr /etc/init.d/solr stop diff --git a/scripts/vagrant/setup.sh b/scripts/vagrant/setup.sh index 108ebefd529..d167e1d60b0 100644 --- a/scripts/vagrant/setup.sh +++ b/scripts/vagrant/setup.sh @@ -40,7 +40,7 @@ echo "Ensuring Unix user '$SOLR_USER' exists" useradd $SOLR_USER || : DOWNLOAD_DIR='/dataverse/downloads' GLASSFISH_ZIP="$DOWNLOAD_DIR/glassfish-4.1.zip" -SOLR_TGZ="$DOWNLOAD_DIR/solr-7.3.1.tgz" +SOLR_TGZ="$DOWNLOAD_DIR/solr-7.7.2.tgz" WELD_PATCH="$DOWNLOAD_DIR/weld-osgi-bundle-2.2.10.Final-glassfish4.jar" # The CA certificate bundle files from CentOS are ok. Glassfish's are expired. GOOD_CACERTS='/etc/pki/ca-trust/extracted/java/cacerts' From 0163204817a59da785c0d6d3a276b89e24cb0035 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Mon, 10 Feb 2020 12:06:08 +0100 Subject: [PATCH 7/9] Update docker-aio with Solr 7.7.2. --- conf/docker-aio/0prep_deps.sh | 4 ++-- conf/docker-aio/1prep.sh | 6 +++--- conf/docker-aio/c7.dockerfile | 8 ++++---- conf/docker-aio/entrypoint.bash | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/conf/docker-aio/0prep_deps.sh b/conf/docker-aio/0prep_deps.sh index 649a190af24..9059439948c 100755 --- a/conf/docker-aio/0prep_deps.sh +++ b/conf/docker-aio/0prep_deps.sh @@ -17,12 +17,12 @@ if [ ! -e dv/deps/glassfish4dv.tgz ]; then # assuming that folks usually have /tmp auto-clean as needed fi -if [ ! -e dv/deps/solr-7.3.1dv.tgz ]; then +if [ ! -e dv/deps/solr-7.7.2dv.tgz ]; then echo "solr dependency prep" # schema changes *should* be the only ones... cd dv/deps/ #wget https://archive.apache.org/dist/lucene/solr/7.3.0/solr-7.3.0.tgz -O solr-7.3.0dv.tgz - wget https://archive.apache.org/dist/lucene/solr/7.3.1/solr-7.3.1.tgz -O solr-7.3.1dv.tgz + wget https://archive.apache.org/dist/lucene/solr/7.7.2/solr-7.7.2.tgz -O solr-7.7.2dv.tgz cd ../../ fi diff --git a/conf/docker-aio/1prep.sh b/conf/docker-aio/1prep.sh index 1dc95f8d45c..a2f2956532a 100755 --- a/conf/docker-aio/1prep.sh +++ b/conf/docker-aio/1prep.sh @@ -4,9 +4,9 @@ # this was based off the phoenix deployment; and is likely uglier and bulkier than necessary in a perfect world mkdir -p testdata/doc/sphinx-guides/source/_static/util/ -cp ../solr/7.3.1/schema*.xml testdata/ -cp ../solr/7.3.1/solrconfig.xml testdata/ -cp ../solr/7.3.1/updateSchemaMDB.sh testdata/ +cp ../solr/7.7.2/schema*.xml testdata/ +cp ../solr/7.7.2/solrconfig.xml testdata/ +cp ../solr/7.7.2/updateSchemaMDB.sh testdata/ cp ../jhove/jhove.conf testdata/ cp ../jhove/jhoveConfig.xsd testdata/ cd ../../ diff --git a/conf/docker-aio/c7.dockerfile b/conf/docker-aio/c7.dockerfile index 7436b73664c..c5663daa3ec 100644 --- a/conf/docker-aio/c7.dockerfile +++ b/conf/docker-aio/c7.dockerfile @@ -17,7 +17,7 @@ COPY testdata/sushi_sample_logs.json /tmp/ COPY disableipv6.conf /etc/sysctl.d/ RUN rm /etc/httpd/conf/* COPY httpd.conf /etc/httpd/conf -RUN cd /opt ; tar zxf /tmp/dv/deps/solr-7.3.1dv.tgz +RUN cd /opt ; tar zxf /tmp/dv/deps/solr-7.7.2dv.tgz RUN cd /opt ; tar zxf /tmp/dv/deps/glassfish4dv.tgz # this copy of domain.xml is the result of running `asadmin set server.monitoring-service.module-monitoring-levels.jvm=LOW` on a default glassfish installation (aka - enable the glassfish REST monitir endpoint for the jvm` @@ -28,9 +28,9 @@ RUN sudo -u postgres /usr/pgsql-9.6/bin/initdb -D /var/lib/pgsql/data # copy configuration related files RUN cp /tmp/dv/pg_hba.conf /var/lib/pgsql/data/ -RUN cp -r /opt/solr-7.3.1/server/solr/configsets/_default /opt/solr-7.3.1/server/solr/collection1 -RUN cp /tmp/dv/schema*.xml /opt/solr-7.3.1/server/solr/collection1/conf/ -RUN cp /tmp/dv/solrconfig.xml /opt/solr-7.3.1/server/solr/collection1/conf/solrconfig.xml +RUN cp -r /opt/solr-7.7.2/server/solr/configsets/_default /opt/solr-7.7.2/server/solr/collection1 +RUN cp /tmp/dv/schema*.xml /opt/solr-7.7.2/server/solr/collection1/conf/ +RUN cp /tmp/dv/solrconfig.xml /opt/solr-7.7.2/server/solr/collection1/conf/solrconfig.xml # skipping glassfish user and solr user (run both as root) diff --git a/conf/docker-aio/entrypoint.bash b/conf/docker-aio/entrypoint.bash index da01ee56153..60f99cf2259 100755 --- a/conf/docker-aio/entrypoint.bash +++ b/conf/docker-aio/entrypoint.bash @@ -2,7 +2,7 @@ export LANG=en_US.UTF-8 #sudo -u postgres /usr/bin/postgres -D /var/lib/pgsql/data & sudo -u postgres /usr/pgsql-9.6/bin/postgres -D /var/lib/pgsql/data & -cd /opt/solr-7.3.1/ +cd /opt/solr-7.7.2/ # TODO: Run Solr as non-root and remove "-force". bin/solr start -force bin/solr create_core -c collection1 -d server/solr/collection1/conf -force From 655420baf96ebad0f6b2a635f362e6e36db9fd9b Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Mon, 10 Feb 2020 13:28:09 +0100 Subject: [PATCH 8/9] Add release note draft for #6599/#6631 --- doc/release-notes/6599-update-solr-772.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/release-notes/6599-update-solr-772.md diff --git a/doc/release-notes/6599-update-solr-772.md b/doc/release-notes/6599-update-solr-772.md new file mode 100644 index 00000000000..cb44b4d104b --- /dev/null +++ b/doc/release-notes/6599-update-solr-772.md @@ -0,0 +1,8 @@ +With this release we upgrade to the latest available stable release in the +Solr 7.x branch. We encourage you to upgrade. See also +[upstream docs](https://lucene.apache.org/solr/guide/7_7/upgrading-a-solr-cluster.html) +for detailed instructions how to update. + +*might be included* +We fixed the schema including some deprecated field types. You should do +a reindex of your data to be safe. From b1fb21db5115038b1b4a074c70c1c59e9b7024a0 Mon Sep 17 00:00:00 2001 From: Philip Durbin Date: Thu, 13 Feb 2020 14:55:45 -0500 Subject: [PATCH 9/9] adjust release note: install fresh #6633 --- doc/release-notes/6599-update-solr-772.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/doc/release-notes/6599-update-solr-772.md b/doc/release-notes/6599-update-solr-772.md index cb44b4d104b..b89caf3db3a 100644 --- a/doc/release-notes/6599-update-solr-772.md +++ b/doc/release-notes/6599-update-solr-772.md @@ -1,8 +1,9 @@ With this release we upgrade to the latest available stable release in the -Solr 7.x branch. We encourage you to upgrade. See also -[upstream docs](https://lucene.apache.org/solr/guide/7_7/upgrading-a-solr-cluster.html) -for detailed instructions how to update. +Solr 7.x branch. -*might be included* -We fixed the schema including some deprecated field types. You should do -a reindex of your data to be safe. +We recommend a fresh installation of Solr 7.2.2 (the index will be empty) +followed by an "index all". + +Before you start the "index all", Dataverse will appear to be empty because +the search results come from Solr. As indexing progresses, results will appear +until indexing is complete.