oraswdb_manage_patches: Improved execution times

The installation time has been improved.
Patches are only copied und unarchived when installation is needed.
Cleanup of patch stage at end of role has been added.

Author: Rendanic

roles/oraswdb_manage_patches/README.md

@@ -5,6 +5,8 @@ Manage Patch Installation in Database ORACLE_HOMEs.
 ## Table of content
 
 - [Requirements](#requirements)
+- [Default Variables](#default-variables)
+  - [oraswdb_manage_patches_cleanup_staging](#oraswdb_manage_patches_cleanup_staging)
 - [Discovered Tags](#discovered-tags)
 - [Dependencies](#dependencies)
 - [License](#license)
@@ -17,8 +19,24 @@ Manage Patch Installation in Database ORACLE_HOMEs.
 - Minimum Ansible version: `2.9.0`
 
 
+## Default Variables
+
+### oraswdb_manage_patches_cleanup_staging
+
+Remove following list of directories after DB-Patching when `oracle_sw_copy: true`:
+
+- "{{ oracle_stage }}/patches"
+
+#### Default value
+
+```YAML
+oraswdb_manage_patches_cleanup_staging: true
+```
+
 ## Discovered Tags
 
+**_always_**
+
 **_apply_patch_db_**
 
 **_autopatch_**
@@ -27,6 +45,8 @@ Manage Patch Installation in Database ORACLE_HOMEs.
 
 **_directories_**
 
+**_molecule-idempotence-notest_**
+
 **_nfsmountdb_**
 
 **_nfsumountdb_**
@@ -35,16 +55,12 @@ Manage Patch Installation in Database ORACLE_HOMEs.
 
 **_oragridopatchget_**
 
-**_oragridpatchget_**
-
 **_oragridpatchpush_**
 
 **_oragridpatchunpack_**
 
 **_oraswdbpsuunpack1_**
 
-**_oraswdbpsuunpack2_**
-
 
 ## Dependencies
 

roles/oraswdb_manage_patches/defaults/main.yml

@@ -1 +1,7 @@
 ---
+# @var oraswdb_manage_patches_cleanup_staging:description: >
+# Remove following list of directories after DB-Patching when `oracle_sw_copy: true`:
+#
+# - "{{ oracle_stage }}/patches"
+# @end
+oraswdb_manage_patches_cleanup_staging: true

…b_manage_patches/tasks/db-home-patch.yml …age_patches/tasks/loop_db-home-patch.ymlroles/oraswdb_manage_patches/tasks/db-home-patch.yml renamed to roles/oraswdb_manage_patches/tasks/loop_db-home-patch.yml roles/oraswdb_manage_patches/tasks/db-home-patch.yml renamed to roles/oraswdb_manage_patches/tasks/loop_db-home-patch.yml

@@ -5,23 +5,25 @@
     msg: "Managing patches for {{ oracle_home_db }}"
   when: apply_patches_db
 
-- name: Transfer files
-  ansible.builtin.include_tasks: transfer-files.yml
-  when: oracle_sw_copy
-
-- name: Unpack uploaded files
-  ansible.builtin.include_tasks: unpack-files.yml
-  when: oracle_sw_unpack and apply_patches_db
-
 - name: Upgrade OPatch
   ansible.builtin.include_tasks: opatch-upgrade.yml
-  when: apply_patches_db
 
-- name: db_opatch | Configure ocm.rsp (1)
+- name: Get list of current installed patches
+  ansible.builtin.command: "{{ oracle_home_db }}/OPatch/opatch lspatches -oh {{ oracle_home_db }}"
+  become: true
+  become_user: "{{ oracle_user }}"
+  changed_when: false
+  register: dbhome_patches
+
+- name: List of current installed patches
+  ansible.builtin.debug:
+    var: dbhome_patches.stdout_lines
+
+- name: Configure ocm.rsp (1)
   ansible.builtin.template:
     src: ocmrsp.expect.j2
     dest: "={{ oracle_patch_stage }}/{{ db_version }}/ocmrsp.expect"
-    mode: "0777"
+    mode: "0644"
     force: true
   when:
     - apply_patches_db
@@ -31,9 +33,8 @@
   tags:
     - ocmconfig
 
-- name: db_opatch | Configure ocm.rsp (2)
-  ansible.builtin.shell: "{{ oracle_patch_stage }}/{{ db_version }}/ocmrsp.expect"
-  # noqa command-instead-of-shell
+- name: Configure ocm.rsp (2)
+  ansible.builtin.command: "{{ oracle_patch_stage }}/{{ db_version }}/ocmrsp.expect"
   when:
     - apply_patches_db
     - current_opatch_version.msg is version_compare('12.2.0.1.5', '<')
@@ -43,7 +44,7 @@
   tags:
     - ocmconfig
 
-- name: db_opatch | Remove unwanted patches from DB
+- name: Remove unwanted patches from DB
   opitzconsulting.ansible_oracle.oracle_opatch:
     oracle_home: "{{ oracle_home_db }}"
     patch_base: "{{ oracle_patch_install }}/{{ db_version }}/{{ item.path | default(item.patchid) }}/"
@@ -65,9 +66,10 @@
   when:
     - apply_patches_db | bool
     - db_homes_config[dbh.home]['opatch'] is defined
+    - dbhome_patches.stdout_lines | select('match', item.patchid | string) | length > 0
   register: psuapplym
 
-- name: db_opatch | Manage opatchauto patches for DB (non-gi)
+- name: Manage opatchauto patches for DB (non-gi)
   opitzconsulting.ansible_oracle.oracle_opatch:
     oracle_home: "{{ oracle_home_db }}"
     patch_base: "{{ oracle_patch_install }}/{{ db_version }}/{{ item.0.path | default (item.0.patchid) }}/{{ item.1 }}"
@@ -95,63 +97,48 @@
     - not olrloc.stat.exists
   register: psuapplym
 
-- name: db_opatch | Manage opatchauto patches for DB (gi)
-  opitzconsulting.ansible_oracle.oracle_opatch:
-    oracle_home: "{{ oracle_home_db }}"
-    patch_base: "{{ oracle_patch_install }}/{{ db_version }}/{{ item.path | default(item.patchid) }}/"
-    patch_id: "{{ item.patchid }}"
-    patch_version: "{{ item.patchversion | default(omit) }}"
-    opatchauto: true
-    conflict_check: true
-    ocm_response_file: "{{ ocm_response_file | default(omit) }}"
-    output: verbose
-    state: "{{ item.state }}"
+- name: Manage Patch from db_home_config with opatchauto
+  ansible.builtin.include_tasks: loop_patchid.yml
   with_items:
     - "{{ db_homes_config[dbh.home]['opatchauto'] }}"
-  # run_once: "{{ _oraswgi_meta_configure_cluster}}"
-  become: true
-  tags:
-    - apply_patch_db
+  loop_control:
+    loop_var: dhc_opatch
+    label: >-
+      home: {{ dbh.home | default('') }}
+      patchid: {{ dhc_opatch.patchid | default('') }}
+      state: {{ dhc_opatch.state | default('') }}
+      excludeUPI: {{ dhc_opatch.excludeUPI | default('') }}
   when:
-    - apply_patches_db and db_homes_config[dbh.home]['opatchauto'] is defined
-    - olrloc.stat.exists
-  register: psuapplym
+    - db_homes_config[dbh.home]['opatchauto'] is defined
+    - dhc_opatch.state | default('') == 'present'
+  vars:
+    __opatchauto_patchtype: true  # opatch opatchauto
 
-# Do not try to revert patches here
-# => That was done with a previous task!
-- name: db_opatch | Manage patches for DB
-  opitzconsulting.ansible_oracle.oracle_opatch:
-    oracle_home: "{{ oracle_home_db }}"
-    patch_base: "{{ oracle_patch_install }}/{{ db_version }}/{{ item.path | default(item.patchid) }}/"
-    patch_id: "{{ item.patchid }}"
-    patch_version: "{{ item.patchversion | default(omit) }}"
-    exclude_upi: "{{ item.excludeUPI | default(omit) }}"
-    opatchauto: false
-    conflict_check: true
-    stop_processes: "{{ item.stop_processes | default(False) }}"
-    ocm_response_file: "{{ ocm_response_file | default(omit) }}"
-    output: verbose
-    state: "{{ item.state }}"
+# manage-patch does everything for 1 patch in a loop
+- name: Manage Patch from db_home_config with opatch
+  ansible.builtin.include_tasks: loop_patchid.yml
   with_items:
-    - "{{ db_homes_config[dbh.home]['opatch'] | selectattr('state', 'match', 'present') }}"
-  # run_once: "{{ _oraswgi_meta_configure_cluster }}"
-  become: true
-  become_user: "{{ oracle_user }}"
-  tags:
-    - apply_patch_db
+    - "{{ db_homes_config[dbh.home]['opatch'] }}"
+  loop_control:
+    loop_var: dhc_opatch
+    label: >-
+      home: {{ dbh.home | default('') }}
+      patchid: {{ dhc_opatch.patchid | default('') }}
+      state: {{ dhc_opatch.state | default('') }}
+      excludeUPI: {{ dhc_opatch.excludeUPI | default('') }}
   when:
-    - apply_patches_db
     - db_homes_config[dbh.home]['opatch'] is defined
-  register: psuapplym
+    - dhc_opatch.state | default('') == 'present'
+  vars:
+    __opatchauto_patchtype: false  # opatch apply
 
-- name: db_opatch | Check patches
-  ansible.builtin.shell: "{{ oracle_home_db }}/OPatch/opatch lspatches -oh {{ oracle_home_db }}"
-  # noqa command-instead-of-shell
+- name: Check patches
+  ansible.builtin.command: "{{ oracle_home_db }}/OPatch/opatch lspatches -oh {{ oracle_home_db }}"
   become: true
   become_user: "{{ oracle_user }}"
   changed_when: false
   register: dbhome_patches
 
-- name: db_opatch | Check patches
+- name: Check patches
   ansible.builtin.debug:
     var: dbhome_patches.stdout_lines

roles/oraswdb_manage_patches/tasks/loop_opatch_apply.yml

@@ -0,0 +1,83 @@
+---
+# Copy and create Stage-Directory for given Patch.
+# See main.yml for loop decriptions
+#
+
+- name: State data for loop_opatch_apply.yml
+  ansible.builtin.debug:
+    msg:
+      - >-
+          patchid: {{ dhc_opatch.patchid | default('') }}
+          unique_patchid: {{ osp_loop.unique_patchid | default('') }}
+      - >-
+          oracle_patch_stage: {{ oracle_patch_stage }}
+          oracle_sw_copy: {{ oracle_sw_copy | bool }}
+          is_sw_source_local: {{ is_sw_source_local | bool }}
+      - >-
+          creates: {{ __sw_patches_filename_creates }}
+          patch_unarchive_dir: {{ __patch_unarchive_dir }}
+
+- name: Become User to oracle
+  become: true
+  become_user: "{{ oracle_user }}"
+  block:
+    - name: db_opatch | Copy oracle DB patch (opatch) to server
+      when:
+        - oracle_sw_copy | bool
+        - dhc_opatch.state == 'present'
+      block:
+
+        - name: db_opatch | Check for unarchived patch archive
+          ansible.builtin.stat:
+            path: "{{ __patch_unarchive_dir }}/{{ __sw_patches_filename_creates }}"
+          register: checkpatcharchiveres
+          vars:
+            __sw_patches_filename_creates: "{{ osp_loop.creates | default((dhc_opatch.patchid | string) + '/README.txt') }}"
+
+        - name: db_opatch | Copy oracle DB patch (opatch) to server (local)
+          ansible.builtin.copy:
+            src: "{{ oracle_sw_source_local }}/{{ osp_loop.filename }}"
+            dest: "{{ oracle_stage }}/{{ osp_loop.filename }}"
+            mode: "0644"
+            force: false
+          when:
+            - is_sw_source_local | bool
+            - not checkpatcharchiveres.stat.exists
+
+        - name: db_opatch | Copy oracle DB patch (opatch) to server (www)
+          ansible.builtin.get_url:
+            url: "{{ oracle_sw_source_www }}/{{ osp_loop.filename }}"
+            dest: "{{ oracle_stage }}/{{ osp_loop.filename }}"
+            mode: "0644"
+            force: false
+          when:
+            - not is_sw_source_local | bool
+            - not checkpatcharchiveres.stat.exists | bool
+
+    - name: db_opatch | Extract one-off patch files to patch base
+      when:
+        - oracle_sw_copy | bool
+        - oracle_sw_unpack | bool
+        - dhc_opatch.state == 'present'
+      tags:
+        - oraswdbpsuunpack1
+      block:
+        - name: db_opatch | Create destination folder for unarchive
+          ansible.builtin.file:
+            dest: "{{ __patch_unarchive_dir }}"
+            mode: 0755
+            state: directory
+
+        - name: db_opatch | Extract one-off patch files to patch base
+          ansible.builtin.unarchive:
+            src: "{{ oracle_stage }}/{{ osp_loop.filename }}"
+            dest: "{{ __patch_unarchive_dir }}"
+            creates: "{{ __patch_unarchive_dir }}/{{ __sw_patches_filename_creates }}"
+            copy: false
+
+        - name: db_opatch | Remove patch archive from stage
+          ansible.builtin.file:
+            path: "{{ oracle_stage }}/{{ osp_loop.filename }}"
+            state: absent
+          when:
+            - oracle_sw_copy | bool

roles/oraswdb_manage_patches/tasks/loop_patchid.yml

@@ -0,0 +1,65 @@
+---
+- name: Work on Patch {{ dhc_opatch.patchid }}
+  ansible.builtin.debug:
+    msg:
+      - >-
+          name: {{ dbh.home }}
+          home: {{ db_homes_config[dbh.home]['oracle_home'] | default('') }}
+      - >-
+          patchid: {{ dhc_opatch.patchid }}
+          state: {{ dhc_opatch.state }}
+      - >-
+          stop_processes: {{ dhc_opatch.stop_processes | default('') }}
+          opatch os user: {{ __opatchauto_patchtype | ternary('root', oracle_user) }}
+          opatchauto: {{ __opatchauto_patchtype }}
+      - >-
+          excludeUPI: {{ dhc_opatch.excludeUPI | default('') }}
+          patchsubdir: {{ __oraswdb_manage_patches_patchsubdir | default('') }}
+
+- name: Work on oracle_sw_patches
+  ansible.builtin.include_tasks: loop_opatch_apply.yml
+  vars:
+    __sw_patches_filename_creates: "{{ osp_loop.creates | default((dhc_opatch.patchid | string) + '/README.txt') }}"
+    __patch_unarchive_dir: "{{ oracle_patch_stage }}/{{ db_version }}/{{ __patch_upisubdir }}/"
+    __patch_upisubdir: >-
+      {%- if osp_loop.unique_patchid is defined -%}
+      upi_{{ osp_loop.unique_patchid -}}/{% endif -%}
+  with_items:
+    - "{{ oracle_sw_patches | selectattr('patchid', 'equalto', dhc_opatch.patchid) }}"
+  loop_control:
+    loop_var: osp_loop
+    label: >-
+      patchid: {{ osp_loop.patchid }}
+      filename: {{ osp_loop.filename }}
+      unique_patchid: {{ osp_loop.unique_patchid | default('') }}
+  when:
+    - apply_patches_db
+    - dhc_opatch.state == 'present'
+    - not dbhome_patches.stdout_lines | select('match', osp_loop.patchid | string) | length > 0
+    - osp_loop.unique_patchid | default(0) == dhc_opatch.excludeUPI | default(0)
+
+- name: Info
+  ansible.builtin.debug:
+    msg: Starting opatch apply. This could take some time to complete...
+
+# opatchauto needs root user for execution
+- name: Manage patch for DB
+  opitzconsulting.ansible_oracle.oracle_opatch:
+    oracle_home: "{{ oracle_home_db }}"
+    patch_base: >-
+      {{ oracle_patch_install }}/{{ db_version }}/{{ dhc_opatch.path | default(__patch_upisubdir + (dhc_opatch.patchid | string)) }}
+    patch_id: "{{ dhc_opatch.patchid }}"
+    patch_version: "{{ dhc_opatch.patchversion | default(omit) }}"
+    exclude_upi: "{{ dhc_opatch.excludeUPI | default(omit) }}"
+    opatchauto: "{{ __opatchauto_patchtype }}"
+    conflict_check: true
+    stop_processes: "{{ dhc_opatch.stop_processes | default(False) }}"
+    ocm_response_file: "{{ ocm_response_file | default(omit) }}"
+    output: verbose
+    state: "{{ dhc_opatch.state }}"
+  become: true
+  become_user: "{{ __opatchauto_patchtype | ternary('root', oracle_user) }}"
+  vars:
+    __patch_upisubdir: >-
+      {%- if dhc_opatch.excludeUPI is defined -%}
+      upi_{{ dhc_opatch.excludeUPI -}}/{% endif -%}