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.

Sign up for GitHub

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

Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
9b7dc26
Merge branch 'develop' into 47-upgrade-solr-8-11
sekmiller Jan 27, 2022
339042c
#47 update solr scripts
sekmiller Jan 27, 2022
9c9be88
#47 update download script
sekmiller Jan 31, 2022
3a91df4
Merge branch 'develop' into 47-upgrade-solr-8-11
sekmiller Feb 2, 2022
1ba337d
#47 update solr.service
sekmiller Feb 2, 2022
c37cb6a
Merge branch 'develop' into 47-upgrade-solr-8-11
sekmiller Feb 2, 2022
7432b37
Merge branch 'develop' into 47-upgrade-solr-8-11
sekmiller Feb 2, 2022
5879030
Merge branch 'develop' into 47-upgrade-solr-8-11
sekmiller Feb 9, 2022
375ea9c
#47 add 8.11 directory
sekmiller Feb 9, 2022
b461f49
Merge branch 'develop' into 47-upgrade-solr-8-11
sekmiller Feb 9, 2022
326ecf3
Merge branch 'develop' into 47-upgrade-solr-8-11
sekmiller Feb 10, 2022
ed9f719
#47 add release notes
sekmiller Feb 10, 2022
559a84d
Update prerequisites.rst
sekmiller Feb 10, 2022
21bb3c4
Update prerequisites.rst
sekmiller Feb 10, 2022
473b4f7
Merge branch 'develop' into 47-upgrade-solr-8-11
sekmiller Feb 16, 2022
30d0d92
upgrade Docker to Solr 8.11.1
pdurbin Feb 16, 2022
40ebccf
upgrade Vagrant to Solr 8.11.1
pdurbin Feb 16, 2022
70856a3
upgrade init script to Solr 8.11.1
pdurbin Feb 16, 2022
1614384
upgrade to Solr 8.11.1 in dev guide
pdurbin Feb 16, 2022
5538d6f
fix link to Solr in Docker
pdurbin Feb 16, 2022
7f2370d
remove old, unused Solr 8.8.1 files (cruft)
pdurbin Feb 16, 2022
1bedb40
.gitignore apache-maven downloaded by docker-aio
pdurbin Feb 16, 2022
ef0ef27
update Makefile to Solr 8.11.1
pdurbin Feb 16, 2022
7633a00
bump solrj to 8.11.1
pdurbin Feb 16, 2022
c11d281
make script executable again
pdurbin Feb 16, 2022
0b5b895
git docs building again following solr upgrade
pdurbin Feb 16, 2022
7e55ea4
Solr 8.11.1 in docker-aio, installer readme, shell test
pdurbin Feb 16, 2022
f5a4622
remove old Solr version from release note
pdurbin Feb 16, 2022
14fff00
Merge branch 'develop' into 47-upgrade-solr-8-11
sekmiller Feb 17, 2022
b02fb94
#47 add line about custom metadata blocks
sekmiller Feb 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions conf/docker-aio/0prep_deps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Copy link

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

wget https://archive.apache.org/dist/lucene/solr/8.8.1/solr-8.8.1.tgz -O solr-8.8.1dv.tgz
wget https://archive.apache.org/dist/lucene/solr/8.8.1/solr-8.11.1.tgz -O solr-8.11.1dv.tgz
cd ../../
fi

8 changes: 4 additions & 4 deletions conf/docker-aio/c8.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,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-8.8.1dv.tgz
RUN cd /opt ; tar zxf /tmp/dv/deps/solr-8.11.1dv.tgz
RUN cd /opt ; unzip /tmp/dv/deps/payara-5.2021.5.zip ; ln -s /opt/payara5 /opt/glassfish4

# 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`
Expand All @@ -34,9 +34,9 @@ RUN sudo -u postgres /usr/pgsql-13/bin/initdb -D /var/lib/pgsql/13/data -E 'UTF-

# copy configuration related files
RUN cp /tmp/dv/pg_hba.conf /var/lib/pgsql/13/data/
RUN cp -r /opt/solr-8.8.1/server/solr/configsets/_default /opt/solr-8.8.1/server/solr/collection1
RUN cp /tmp/dv/schema*.xml /opt/solr-8.8.1/server/solr/collection1/conf/
RUN cp /tmp/dv/solrconfig.xml /opt/solr-8.8.1/server/solr/collection1/conf/solrconfig.xml
RUN cp -r /opt/solr-8.11.1/server/solr/configsets/_default /opt/solr-8.11.1/server/solr/collection1
RUN cp /tmp/dv/schema*.xml /opt/solr-8.11.1/server/solr/collection1/conf/
RUN cp /tmp/dv/solrconfig.xml /opt/solr-8.11.1/server/solr/collection1/conf/solrconfig.xml

# skipping payara user and solr user (run both as root)

Expand Down
2 changes: 1 addition & 1 deletion conf/docker-aio/entrypoint.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
export LANG=en_US.UTF-8
sudo -u postgres /usr/pgsql-13/bin/pg_ctl start -D /var/lib/pgsql/13/data &
cd /opt/solr-8.8.1/
cd /opt/solr-8.11.1/
# 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
Expand Down
1 change: 1 addition & 0 deletions conf/solr/8.11.1/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Please see the dev guide for what to do with Solr config files.
1,546 changes: 1,546 additions & 0 deletions conf/solr/8.11.1/schema.xml
View file
Open in desktop

Large diffs are not rendered by default.

Loading