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

Upgrade Solr to 9.3.0 #9787

Merged
merged 28 commits into from
Aug 28, 2023
Merged

Upgrade Solr to 9.3.0 #9787

merged 28 commits into from
Aug 28, 2023

Conversation

pdurbin
Copy link
Member

@pdurbin pdurbin commented Aug 16, 2023

What this PR does / why we need it:

Installations (and potential installations) have asked us to upgrade Solr.

Which issue(s) this PR closes:

Special notes for your reviewer:

Suggestions on how to test this:

Make sure to use the new -Dsolr.modules=scripting flag when starting Solr. No longer needed now that we merged #9826 into this PR.

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

No.

Is there a release notes update needed for this change?:

Yes, included.

Additional documentation:

The guides have been updated.

Update all Solr references from 8.11.1 to 9.3.0 and
make sure you can spin up containers.

schema.xml was copied from
solr-9.3.0/server/solr/configsets/_default/conf/managed-schema.xml

(Note managed-schema.xml as there is no schema.xml upstream.)

solrconfig.xml was copied from
solr-9.3.0/server/solr/configsets/_default/conf/solrconfig.xml

API tests will fail, of course, because we have not yet added
our Dataverse-specific config. We'll be moving it from these
files and then deleting them:

conf/solr/8.11.1/schema.xml
conf/solr/8.11.1/solrconfig.xml
@pdurbin pdurbin self-assigned this Aug 16, 2023
@@ -52,7 +52,7 @@ echo "Ensuring Unix user '$SOLR_USER' exists"
useradd $SOLR_USER || :
DOWNLOAD_DIR='/dataverse/downloads'
PAYARA_ZIP="$DOWNLOAD_DIR/payara-6.2023.7.zip"
SOLR_TGZ="$DOWNLOAD_DIR/solr-8.11.1.tgz"
SOLR_TGZ="$DOWNLOAD_DIR/solr-9.3.0.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

@pdurbin pdurbin added this to the 6.0 milestone Aug 16, 2023
@pdurbin pdurbin removed their assignment Aug 16, 2023
@github-actions

This comment has been minimized.

1 similar comment
@github-actions

This comment has been minimized.

Conflicts:
downloads/download.sh
scripts/vagrant/setup.sh
@coveralls
Copy link

coveralls commented Aug 18, 2023

Coverage Status

coverage: 19.968%. remained the same when pulling 3944cf1 on 9260-solr930 into 497c578 on develop.

@github-actions

This comment has been minimized.

1 similar comment
@github-actions

This comment has been minimized.

@pdurbin pdurbin self-assigned this Aug 18, 2023
@github-actions

This comment has been minimized.

1 similar comment
@github-actions

This comment has been minimized.

@github-actions

This comment has been minimized.

1 similar comment
@github-actions

This comment has been minimized.

@pdurbin pdurbin removed their assignment Aug 22, 2023
@pdurbin
Copy link
Member Author

pdurbin commented Aug 22, 2023

In 926e6ea I doubled the amount of sleep in a test that was failing for me locally (and in Oliver's JUnit 5 PR).

@kcondon I'm ready for you to take a look. Please be advised that even though SearchIT passes for me locally, Jenkins and GitHub Actions have said otherwise. I'm not sure why.

@johannes-darms
Copy link
Contributor

@pdurbin: Thanks for the update. I have a smaller request. Would it be possible to link the SOLR documentation [1] that explains why the scripting module is needed

[1] https://solr.apache.org/guide/solr/latest/upgrade-notes/major-changes-in-solr-9.html#security-2

@github-actions

This comment has been minimized.

1 similar comment
@github-actions

This comment has been minimized.

@kcondon kcondon removed their assignment Aug 25, 2023
@pdurbin pdurbin self-assigned this Aug 28, 2023
@github-actions

This comment has been minimized.

2 similar comments
@github-actions

This comment has been minimized.

@github-actions

This comment has been minimized.

@pdurbin pdurbin removed their assignment Aug 28, 2023
@kcondon kcondon self-assigned this Aug 28, 2023
@@ -0,0 +1,3 @@
Solr has been upgraded to Solr 9. You must install Solr fresh and reindex.

If you have custom metadata blocks installed, you must update your Solr schema.xml to include your custom fields. Please see https://guides.dataverse.org/en/9260-solr930/admin/metadatacustomization.html#updating-the-solr-schema
Copy link
Contributor

Choose a reason for hiding this comment

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

Any chance we could add just a couple of sentences here, clarifying what needs to be done? I fear this may confuse some people. Instead of you must update your solr schema, maybe spell it out as you must copy the schema.xml from the source tree, here, then update it to include your custom fields, see ... for instructions. If you don't use custom metadata blocks, use the schema.xml supplied in the source tree as is. **Do not attempt to reuse your existing 8.11 schema.xml!** - something along these lines?

Copy link
Member Author

Choose a reason for hiding this comment

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

@landreev sure, good idea. Please check out be34440 and please feel free to edit at will!

Copy link
Contributor

@landreev landreev left a comment

Choose a reason for hiding this comment

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

Yay, solr-9!

@kcondon kcondon merged commit 7f24353 into develop Aug 28, 2023
15 of 16 checks passed
@kcondon kcondon deleted the 9260-solr930 branch August 28, 2023 19:41
@github-actions

This comment has been minimized.

3 similar comments
@github-actions

This comment has been minimized.

@github-actions

This comment has been minimized.

@github-actions
Copy link

📦 Pushed preview images as

ghcr.io/gdcc/dataverse:9260-solr930
ghcr.io/gdcc/configbaker:9260-solr930

🚢 See on GHCR. Use by referencing with full name as printed above, mind the registry name.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
7 participants