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

7000 mpconfig files basic #8827

Merged
merged 10 commits into from
Jan 18, 2023
Merged

Conversation

poikilotherm
Copy link
Contributor

@poikilotherm poikilotherm commented Jun 30, 2022

What this PR does / why we need it:
Replace all lookups of the dataverse.files.directory with MPCONFIG and provide a sane default /tmp/dataverse (as seen with some of the former usages). Also add lots of detail docs to the config guide about this setting.

This PR is fully backward compatible with any existing configurations as it does no renaming or behaviour changes (except for the default, but every installation out there is very likely not relying on a default for this setting!).

Relates to #7000

Which issue(s) this PR closes:
None.

Special notes for your reviewer:
It is the next simple example to see how the pieces laid out in #8823 are coming together.

Suggestions on how to test this:
Play around with the settings described in the little dev docs section and watch it work.

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

Is there a release notes update needed for this change?:
Maybe? Dunno. Please leave comment. IMHO this is very much dev-only.

Additional documentation:
Included.

@poikilotherm poikilotherm added Feature: File Upload & Handling Component: Code Infrastructure formerly "Feature: Code Infrastructure" Feature: Installation Guide User Role: Sysadmin Installs, upgrades, and configures the system, connects via ssh Component: Containers Anything related to cloudy Dataverse, shipped in containers. labels Jun 30, 2022
@poikilotherm poikilotherm force-pushed the 7000-mpconfig-files-basic branch from 066d059 to b0b96b3 Compare July 6, 2022 14:23
@poikilotherm poikilotherm force-pushed the 7000-mpconfig-files-basic branch from b0b96b3 to 8ac60bb Compare July 13, 2022 14:31
… MPCONFIG IQSS#7000

- Adding dataverse.files.directory equivalent to JvmSettings
- Remove all System.getPropert("dataverse.files.directory") or similar
- Add default with /tmp/dataverse via microprofile-config.properties as formerly seen at FileUtil and Dataset only
- Refactor SwordConfigurationImpl to reuse the NoSuchElementException thrown by MPCONFIG
- Refactor GoogleCloudSubmitToArchiveCommand to use the JvmSettings.lookup and create file stream in try-with-resources
@poikilotherm poikilotherm force-pushed the 7000-mpconfig-files-basic branch from 8ac60bb to d7ab9f6 Compare September 16, 2022 09:00
@coveralls
Copy link

coveralls commented Sep 16, 2022

Coverage Status

Coverage: 20.035% (+0.002%) from 20.033% when pulling b7aecf5 on poikilotherm:7000-mpconfig-files-basic into ac1454b on IQSS:develop.

@mreekie mreekie added the bk2211 label Nov 1, 2022
Copy link
Member

@qqmyers qqmyers left a comment

Choose a reason for hiding this comment

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

More conversions to microprofile. The documentation here raises an issue as to whether we have out-of-date info elsewhere in the guides (re: the dir to add files to when doing an import) that should be fixed somewhere (with the docs being added here corrected to match).

FWIW: @scolapasta, @kcondon, and I had a discussion about how to QA these mp conversions since they are all repeating the same pattern. I think the outcome was to just check that a JVMoption/mpconfig file, env variable works once on some PR and for the rest of the conversions just test that one mode works (i.e. the existing jvm option today) - versus checking that all options work for every setting that is updated in every PR.

@pdurbin pdurbin added the Size: 3 A percentage of a sprint. 2.1 hours. label Dec 2, 2022
@mreekie
Copy link

mreekie commented Dec 14, 2022

added to sprint Dec 15, 2022

@pdurbin
Copy link
Member

pdurbin commented Dec 19, 2022

@poikilotherm heads up that this PR has merge conflicts.

@poikilotherm
Copy link
Contributor Author

All set - forgot to push the merge....

@pdurbin
Copy link
Member

pdurbin commented Dec 20, 2022

@poikilotherm as expected, more merge conflicts as other PRs are merged. Can you please resolve them?

@pdurbin
Copy link
Member

pdurbin commented Dec 21, 2022

@poikilotherm merge conflicts and it looks like there are changes requested by @qqmyers. Can you please take a look?


Update: I checked with Oliver about this and he said we should discuss it next year.

@pdurbin pdurbin self-assigned this Jan 9, 2023
@mreekie
Copy link

mreekie commented Jan 11, 2023

Sizing:

  • for next sprint
  • 3

@kcondon kcondon self-assigned this Jan 18, 2023
@kcondon kcondon merged commit 1bef93a into IQSS:develop Jan 18, 2023
@poikilotherm
Copy link
Contributor Author

🥳 another one merged! Thanks for keeping up the pace @kcondon

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Component: Code Infrastructure formerly "Feature: Code Infrastructure" Component: Containers Anything related to cloudy Dataverse, shipped in containers. Feature: File Upload & Handling Feature: Installation Guide Size: 3 A percentage of a sprint. 2.1 hours. User Role: Sysadmin Installs, upgrades, and configures the system, connects via ssh
Projects
Status: No status
Development

Successfully merging this pull request may close these issues.

6 participants