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

Version 1.8.11 #309

Merged
merged 4 commits into from
Oct 11, 2023
Merged

Version 1.8.11 #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e36b19e
YDA-5375 Update cronjob for revision cleanup.
dworkin Sep 1, 2023
fe92296
YDA-5405: add verbose mode for revision cleanup
stsnel Sep 26, 2023
463e8d0
Deposit module: Remove old indexing scripts
stsnel Oct 6, 2023
29e32d1
Merge branch 'release-1.8' into rc-1.8.11
stsnel Oct 11, 2023
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
1 change: 1 addition & 0 deletions docs/administration/configuring-yoda.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ enable_revisions | Enable revisions: yes (1) or no (0)
async_revision_verbose_mode | Enable verbose logging revision job (true/false, default: true)
async_revision_delay_time | Delay after last modification to data object before revision job can process it (in seconds, default: 0)
enable_revision_cleanup | Enable cleanup job for removing old revisions (true/false, default: true)
revision_cleanup_verbose_mode | Print extra information in revision cleanup job for troubleshooting (true/false, default: false)
enable_async_replication | Enable asynchronous replication cronjob: yes (1) or no (0)
async_replication_verbose_mode | Enable verbose logging replication job (true/false, default: true)
async_replication_delay_time | Delay after last modification to data object before replication job can process it (in seconds, default: 0)
Expand Down
1 change: 1 addition & 0 deletions roles/yoda_rulesets/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ enable_revisions: 1 # Enable revisions: yes (1) or no (0)
async_revision_verbose_mode: false
async_revision_delay_time: 0 # Delay after last modification to data object before revision job can process it (sec)
enable_revision_cleanup: true # Enable revision cleanup job (true/false)
revision_cleanup_verbose_mode: false # Print extra information in revision cleanup job for troubleshooting (true/false)
revision_strategy: B # Revision strategy: A, B, J or Simple
yoda_instance: "{{ instance }}"
update_rulesets: true # Update already installed rulesets with git
Expand Down
2 changes: 1 addition & 1 deletion roles/yoda_rulesets/tasks/yoda-ruleset.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
- admin-vaultingest.sh


- name: Remove legacy msiExecCmd indexing scripts
- name: Ensure old indexing scripts have been removed
become_user: "{{ irods_service_account }}"
become: true
ansible.builtin.file:
Expand Down
2 changes: 1 addition & 1 deletion roles/yoda_rulesets/templates/cronjob-revision-cleanup.sh.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
TIMESTAMP=`date +%s`
OFFSET={{ (ansible_date_time.tz_offset|int / 100)|int }}
TIMESTAMP=$(( $TIMESTAMP - ($OFFSET * 60 * 60)))
/usr/bin/irule -r irods_rule_engine_plugin-irods_rule_language-instance -F /etc/irods/yoda-ruleset/tools/revision-clean-up.r "*endOfCalendarDay=${TIMESTAMP}" '*bucketcase="{{ revision_strategy }}"'
/etc/irods/yoda-ruleset/tools/revision-clean-up.py ${TIMESTAMP} '{{ revision_strategy }}' {{ "-v" if revision_cleanup_verbose_mode else "" }}
Loading