Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

47 upgrade solr 8 11 #8415

Merged
merged 30 commits into from
Feb 18, 2022
Merged

47 upgrade solr 8 11 #8415

merged 30 commits into from
Feb 18, 2022

Conversation

sekmiller
Copy link
Contributor

@sekmiller sekmiller commented Feb 10, 2022

What this PR does / why we need it: Upgrade the version of solr to 8.11.1 which is the latest stable version

Which issue(s) this PR closes:

Closes #ds47 Upgrade to Solr 8.11.1

Special notes for your reviewer: Aside from the renaming of files/directories the only real change is to update a the class of the filter cache in solrconfig

Suggestions on how to test this:

Does this PR introduce a user interface change? If mockups are available, please link/include them here:

Is there a release notes update needed for this change?:
Release notes are added to the branch
Additional documentation: Prerequisites section of the doc has been updated

@pdurbin
Copy link
Member

pdurbin commented Feb 16, 2022

Test comment. Please ignore.

@@ -52,7 +52,7 @@ echo "Ensuring Unix user '$SOLR_USER' exists"
useradd $SOLR_USER || :
DOWNLOAD_DIR='/dataverse/downloads'
PAYARA_ZIP="$DOWNLOAD_DIR/payara-5.2021.5.zip"
SOLR_TGZ="$DOWNLOAD_DIR/solr-8.8.1.tgz"
SOLR_TGZ="$DOWNLOAD_DIR/solr-8.11.1.tgz"
if [ ! -f $PAYARA_ZIP ] || [ ! -f $SOLR_TGZ ]; then
echo "Couldn't find $PAYARA_ZIP or $SOLR_TGZ! Running download script...."
cd $DOWNLOAD_DIR && ./download.sh && cd

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ [shellcheck] reported by reviewdog 🐶
Use 'cd ... || exit' or 'cd ... || return' in case cd fails. SC2164

@@ -9,11 +9,11 @@ if [ ! -e dv/deps/payara-5.2021.5.zip ]; then
wget https://s3-eu-west-1.amazonaws.com/payara.fish/Payara+Downloads/5.2021.5/payara-5.2021.5.zip -O dv/deps/payara-5.2021.5.zip
fi

if [ ! -e dv/deps/solr-8.8.1dv.tgz ]; then
if [ ! -e dv/deps/solr-8.11.1dv.tgz ]; then
echo "solr dependency prep"
# schema changes *should* be the only ones...
cd dv/deps/

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ [shellcheck] reported by reviewdog 🐶
Use 'cd ... || exit' or 'cd ... || return' in case cd fails. SC2164

Copy link
Member

@pdurbin pdurbin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm sending this to QA even thought I'm aware that that "Shellspec / Shellcheck" test is failing (this is something @poikilotherm added and if wants to follow up with a future pull request to fix it, that's fine with me.)

I did some basic testing in docker-aio such as creating a dataset.

I didn't test Vagrant. Hopefully people who use it will let us know if something's broken.

@pdurbin pdurbin removed their assignment Feb 16, 2022
@@ -408,7 +408,7 @@
to occupy. Note that when this option is specified, the size
and initialSize parameters are ignored.
-->
<filterCache class="solr.FastLRUCache"
<filterCache class="solr.search.CaffeineCache"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My understanding is that we are changing this to prevent this error in server.log:

Search Syntax Error: Error from server at http://localhost:8983/solr/collection1: Using join queries with synchronous filterCache is not supported! Details can be found in Solr Reference Guide under 'query-settings-in-solrconfig'.

@poikilotherm
Copy link
Contributor

poikilotherm commented Feb 17, 2022

I'm sending this to QA even thought I'm aware that that "Shellspec / Shellcheck" test is failing (this is something @poikilotherm added and if wants to follow up with a future pull request to fix it, that's fine with me.)

Shellspec is happy - Shellcheck is unhappy with some shellscripts for Docker etc and left a few review comments. Feel free to ignore...

@kcondon kcondon self-assigned this Feb 17, 2022
@kcondon kcondon merged commit 1e8957c into develop Feb 18, 2022
@kcondon kcondon deleted the 47-upgrade-solr-8-11 branch February 18, 2022 16:55
@pdurbin pdurbin added this to the 5.10 milestone Feb 18, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants