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

HYC-1968 - Solr 9 #1140

Merged
merged 14 commits into from
Jan 29, 2025
Merged

HYC-1968 - Solr 9 #1140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2235ced
Update config for solr 9 in dev
bbpennel Jan 21, 2025
dfe9f97
Update solr config again, fix some path issues
bbpennel Jan 23, 2025
d47413e
Simple attempt to update solr in github build
bbpennel Jan 23, 2025
4bd0b16
Make queries default to *:* like they did in solr 8, since hyrax does…
bbpennel Jan 23, 2025
8686de4
Adjust requestHandlers for solr 8 backwards compatibility since hyrax…
bbpennel Jan 24, 2025
fffc591
Adjust solr setup to run via a step so that precreate command can be …
bbpennel Jan 24, 2025
7d550c9
Wait for solr to come online
bbpennel Jan 24, 2025
6d6cefa
Try as service again
bbpennel Jan 24, 2025
357fa32
Try as configset
bbpennel Jan 24, 2025
aa9aa84
Adjust path
bbpennel Jan 24, 2025
5124bf2
Add env variable
bbpennel Jan 27, 2025
64a093b
Reenable build
bbpennel Jan 27, 2025
dfbc5d3
Remove /select requestHandler and enable handleSelect on requestDispa…
bbpennel Jan 29, 2025
fd77be1
Move docker to using solr modules env variable
bbpennel Jan 29, 2025
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
13 changes: 9 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,13 @@ jobs:
--health-timeout 5s
ports: ["5432:5432"]
solr:
image: solr:8.11-slim
image: solr:9
ports:
- 8983:8983
options: >-
--name solr_container
env:
SOLR_MODULES: analysis-extras,extraction
clamavd:
image: lokori/clamav-java
ports:
Expand Down Expand Up @@ -124,11 +126,14 @@ jobs:
run: |
psql -c 'create database hyrax_test with owner hyrax;'

- name: Copy solr config into docker container
run: docker cp solr/config solr_container:/tmp/solr_config
- name: Create ConfigSet Directory
run: docker exec solr_container bash -c "mkdir -p /var/solr/configsets/hy-c/conf"

- name: Copy Solr Config into container
run: docker cp ./solr/config/. solr_container:/var/solr/configsets/hy-c/conf

- name: Create Solr core
run: docker exec solr_container solr create -c hydra-test -d /tmp/solr_config
run: docker exec solr_container solr create_core -c hydra-test -d /var/solr/configsets/hy-c

- name: Run rspec tests
run: bundle exec rspec
Expand Down
27 changes: 17 additions & 10 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ services:
- clamav
- db
- fedora
- solr8
- solr
env_file:
- docker/.env
ports:
Expand All @@ -35,7 +35,7 @@ services:
- db
- fedora
- redis
- solr8
- solr
- web
command: sh /hyrax/docker/start-sidekiq.sh
env_file:
Expand Down Expand Up @@ -92,26 +92,33 @@ services:
- "6379:6379"
networks:
- hycdev
solr8:
image: solr:8.11-slim
solr:
image: solr:9
user: "8983:8983"
volumes:
- ./solr/config:/opt/solr/server/solr/configsets/hy-c
- solr8-data:/var/solr/data
- ./solr/config:/opt/solr/server/solr/configsets/hy-c/conf
- solr-data:/var/solr/data
ports:
- "8983:8983"
command: >
bash -c "
precreate-core hydra-development /opt/solr/server/solr/configsets/hy-c &&
precreate-core hydra-test /opt/solr/server/solr/configsets/hy-c &&
exec solr -f
mkdir -p /var/solr/data &&
chown -R 8983:8983 /var/solr &&
chown -R 8983:8983 /var/solr/data &&
gosu solr precreate-core hydra-development /opt/solr/server/solr/configsets/hy-c &&
gosu solr precreate-core hydra-test /opt/solr/server/solr/configsets/hy-c &&
gosu solr solr -f
"
environment:
- SOLR_MODULES=analysis-extras,extraction
user: root
networks:
- hycdev
volumes:
mount-code:
mount-gems:
mount-sidekiq-gems:
solr8-data:
solr-data:
clam:
pg_data:
fcrepo_data:
Expand Down
4 changes: 2 additions & 2 deletions docker/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ HYRAX_DATABASE_PASSWORD=password
HYRAX_HOST=https://localhost:3000
REDIS_HOST=redis
REDIS_URL=redis://redis:6379/0
SOLR_DEV_URL=http://solr8:8983/solr/hydra-development
SOLR_TEST_URL=http://solr8:8983/solr/hydra-test
SOLR_DEV_URL=http://solr:8983/solr/hydra-development
SOLR_TEST_URL=http://solr:8983/solr/hydra-test
RIIIF_CACHE_PATH=/opt/hyrax/riiif_cache
RAILS_CACHE_PATH=/opt/rails-cache
16 changes: 8 additions & 8 deletions solr/config/schema.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
that avoids logging every request
-->

<schema name="Hydra Demo Index" version="1.5">
<schema name="Hydra Demo Index" version="1.6">
<!-- attribute "name" is the name of this schema and is only used for display purposes.
Applications should change this to reflect the nature of the search collection.
version="1.5" is Solr's version number for the schema syntax and semantics. It should
Expand Down Expand Up @@ -84,7 +84,7 @@
<!-- A PointField based date field for faster date range queries and date faceting. -->
<fieldType name="tdate" class="solr.DatePointField" docValues="true"/>
<!-- A DateRange based date field for truly faster date range queries. -->
<fieldType name="dateRange" class="solr.DateRangeField" omitNorms="true" omitTermFreqAndPositions="true"/>
<fieldType name="dateRange" class="solr.DateRangeField"/>

<!-- This point type indexes the coordinates as separate fields (subFields)
If subFieldType is defined, it references a type, and a dynamic field
Expand All @@ -108,8 +108,8 @@

<fieldType name="text" class="solr.TextField" omitNorms="false">
<analyzer>
<tokenizer class="solr.ICUTokenizerFactory"/>
<filter class="solr.ICUFoldingFilterFactory"/> <!-- NFKC, case folding, diacritics removed -->
<tokenizer class="org.apache.lucene.analysis.icu.segmentation.ICUTokenizerFactory"/>
<filter class="org.apache.lucene.analysis.icu.ICUFoldingFilterFactory"/> <!-- NFKC, case folding, diacritics removed -->
<filter class="solr.TrimFilterFactory"/>
</analyzer>
</fieldType>
Expand All @@ -126,7 +126,7 @@
<fieldType name="text_ws_icu" class="solr.TextField" positionIncrementGap="100">
<analyzer>
<tokenizer class="solr.WhitespaceTokenizerFactory"/>
<filter class="solr.ICUFoldingFilterFactory"/>
<filter class="org.apache.lucene.analysis.icu.ICUFoldingFilterFactory"/>
<filter class="solr.TrimFilterFactory"/>
</analyzer>
</fieldType>
Expand All @@ -135,16 +135,16 @@
<fieldtype name="alphaSort" class="solr.TextField" sortMissingLast="true" omitNorms="true">
<analyzer>
<tokenizer class="solr.KeywordTokenizerFactory" />
<filter class="solr.ICUFoldingFilterFactory"/>
<filter class="org.apache.lucene.analysis.icu.ICUFoldingFilterFactory"/>
<filter class="solr.TrimFilterFactory" />
</analyzer>
</fieldtype>

<!-- A text field with defaults appropriate for English -->
<fieldType name="text_en" class="solr.TextField" positionIncrementGap="100">
<analyzer>
<tokenizer class="solr.ICUTokenizerFactory"/>
<filter class="solr.ICUFoldingFilterFactory"/> <!-- NFKC, case folding, diacritics removed -->
<tokenizer class="org.apache.lucene.analysis.icu.segmentation.ICUTokenizerFactory"/>
<filter class="org.apache.lucene.analysis.icu.ICUFoldingFilterFactory"/> <!-- NFKC, case folding, diacritics removed -->
<filter class="solr.EnglishPossessiveFilterFactory"/>
<!-- EnglishMinimalStemFilterFactory is less aggressive than PorterStemFilterFactory: -->
<filter class="solr.EnglishMinimalStemFilterFactory"/>
Expand Down
Loading