From 5b1211312787808bbc651ad58217cf3ec3321d2b Mon Sep 17 00:00:00 2001 From: llara Date: Fri, 7 Aug 2020 11:43:32 -0700 Subject: [PATCH 1/2] basic checks before upgrades This commit will search for files in the completeTransfers folder before attempting an upgrade to avoid the "mail-bomb" problem. There are two variables that can be run with the playbook: check_for_upgrade_requirements: True (dafault value) - this will load the upgrade-requirements.yml task force_completedTransfers_cleanup: False (default value) - this will force cleanup of the completedTransfers folder --- defaults/main.yml | 6 ++++++ tasks/main.yml | 9 +++++++++ tasks/upgrade-requirements.yml | 20 ++++++++++++++++++++ 3 files changed, 35 insertions(+) create mode 100644 tasks/upgrade-requirements.yml diff --git a/defaults/main.yml b/defaults/main.yml index ab6d01b7..519f3560 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -180,6 +180,12 @@ archivematica_src_configure_am_whitelist: '""' # Dashboard API whi # uri_prefix: "http://amurl" # ASpace uri_prefix +# +# upgrade requirements checks +# +check_for_upgrade_requirements: True +force_completedTransfers_cleanup: False + # # Send logs to syslog # diff --git a/tasks/main.yml b/tasks/main.yml index 058a734b..1457727d 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -84,6 +84,15 @@ archivematica_src_install_am|bool or archivematica_src_install_am=='rpm'" +# +# basic checks before upgrade +# + +- include: upgrade-requirements.yml + tags: "check-upgrade-requirements" + when: + - "check_for_upgrade_requirements|bool" + - "archivematica_src_configure_dashboard|bool" - name: "Checkout out archivematica-sampledata repository" git: diff --git a/tasks/upgrade-requirements.yml b/tasks/upgrade-requirements.yml new file mode 100644 index 00000000..b9693a58 --- /dev/null +++ b/tasks/upgrade-requirements.yml @@ -0,0 +1,20 @@ +--- +# The intention of this task is to check for some basic requirements for upgrading archivematica + +- name: "Checking completedTransfers folder for files..." + shell: ls {{ archivematica_src_shareddir }}/watchedDirectories/SIPCreation/completedTransfers | wc -l + register: completedTransfersFiles + +- name: "CompletedTransfers folder has {{ completedTransfersFiles.stdout }} files" + fail: + msg: "Abort!! The {{ archivematica_src_shareddir }}watchedDirectories/SIPCreation/completedTransfers has + {{ completedTransfersFiles.stdout }} files and could cause a large amount of emails after the upgrade. /n + Please remove these files before continue or set the variable force_completedTransfers_cleanup: True " + when: "completedTransfersFiles.stdout != 0 and not force_completedTransfers_cleanup|bool" + +- name: Cleaning {{ archivematica_src_shareddir }} folder before upgrading +# file: +# state: absent +# path: "{{ archivematica_src_shareddir }}/watchedDirectories/SIPCreation/completedTransfers/" + shell: "rm -rf {{ archivematica_src_shareddir }}/watchedDirectories/SIPCreation/completedTransfers/*" + when: "completedTransfersFiles.stdout != 0 and force_completedTransfers_cleanup|bool" \ No newline at end of file From 5194be2b1f9ce5d8520d37ab6965852ba53315d0 Mon Sep 17 00:00:00 2001 From: llara Date: Mon, 10 Aug 2020 08:21:14 -0700 Subject: [PATCH 2/2] conditional check modification --- tasks/upgrade-requirements.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/tasks/upgrade-requirements.yml b/tasks/upgrade-requirements.yml index b9693a58..889f875f 100644 --- a/tasks/upgrade-requirements.yml +++ b/tasks/upgrade-requirements.yml @@ -7,14 +7,19 @@ - name: "CompletedTransfers folder has {{ completedTransfersFiles.stdout }} files" fail: - msg: "Abort!! The {{ archivematica_src_shareddir }}watchedDirectories/SIPCreation/completedTransfers has - {{ completedTransfersFiles.stdout }} files and could cause a large amount of emails after the upgrade. /n - Please remove these files before continue or set the variable force_completedTransfers_cleanup: True " - when: "completedTransfersFiles.stdout != 0 and not force_completedTransfers_cleanup|bool" + msg: + - "Abort!! The {{ archivematica_src_shareddir }}watchedDirectories/SIPCreation/completedTransfers has + {{ completedTransfersFiles.stdout }} files and could cause a large amount of emails after the upgrade." + - "Please remove these files before continue or set the variable force_completedTransfers_cleanup: True " + when: + - completedTransfersFiles.stdout != "0" + - not force_completedTransfers_cleanup|bool - name: Cleaning {{ archivematica_src_shareddir }} folder before upgrading # file: # state: absent # path: "{{ archivematica_src_shareddir }}/watchedDirectories/SIPCreation/completedTransfers/" shell: "rm -rf {{ archivematica_src_shareddir }}/watchedDirectories/SIPCreation/completedTransfers/*" - when: "completedTransfersFiles.stdout != 0 and force_completedTransfers_cleanup|bool" \ No newline at end of file + when: + - completedTransfersFiles.stdout != "0" + - force_completedTransfers_cleanup|bool \ No newline at end of file