Merge pull request #309 from UtrechtUniversity/rc-1.8.11

Version 1.8.11
UtrechtUniversity · Oct 11, 2023 · 2697849 · 2697849
2 parents f3691b6 + 29e32d1
commit 2697849
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/docs/administration/configuring-yoda.md b/docs/administration/configuring-yoda.md
@@ -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)

diff --git a/roles/yoda_rulesets/defaults/main.yml b/roles/yoda_rulesets/defaults/main.yml
@@ -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

diff --git a/roles/yoda_rulesets/tasks/yoda-ruleset.yml b/roles/yoda_rulesets/tasks/yoda-ruleset.yml
@@ -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:

diff --git a/roles/yoda_rulesets/templates/cronjob-revision-cleanup.sh.j2 b/roles/yoda_rulesets/templates/cronjob-revision-cleanup.sh.j2
@@ -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 "" }}