Merge pull request #40 from thedatabaseme/develop

Fixed #3: Pythia now checks if there are running instances before adjusting the sysctl.conf

Author: thedatabaseme

Changelog.txt

@@ -1,5 +1,8 @@
 Changelog of Pythia:
 
+Version 2.3.6
+  - Fixed #3: Pythia now checks if there are running instances before adjusting the sysctl.conf
+
 Version 2.3.5
   - New Feature #34: using the shell command with sqlplus has been replaced by the oracle_sql
     module

roles/pythia/README.md

@@ -76,9 +76,6 @@ main.yml Variables (can be set when calling the playbook, see Examples):
   - sles15_packages, sles12_packages, rhel7_packages: A list of Packages that will be installed before installing the Oracle RDBMS Software. The list can be found in the Oracle Installation Guide Documentation for each OS.
   - shmall (Default 2097152): Will be calculated during Playbook Runtime. Will be included to the sysctl Configuration when deploying a Database
   - shmmax (Default 4294967295): Will be calculated during Playbook Runtime. Will be included to the sysctl Configuration when deploying a Database
-  - current_shmall (Default 0): Just for initializing the Variable. Must not be modified
-  - current_shmmax (Default 0): Just for initializing the Variable. Must not be modified
-  - current_hugepages (Default 0): Just for initializing the Variable. Must not be modified
   - hugepages (Default 0): Will be calculated during Playbook Runtime. Will be included to the sysctl Configuration when deploying a Database
   - client_install_type (Default Administrator): Choose Which Client Install Type you want to install. Can be Administrator, Runtime, InstantClient or Custom
   - datapump_source_host (Default NULL): The source host on which the datapump_source_sid is running. Only needed when starting the playbook with the "datapump" tag, for doing an Datapump Export / Import a Database.

roles/pythia/tasks/main.yml

@@ -1,7 +1,7 @@
 ---
 # ####################################################################
 # Main Task File for Pythia
-# Version 2.3.5
+# Version 2.3.6
 # Author: thedatabaseme / Philip Haberkern
 # For more Details view README.md
 # ####################################################################

roles/pythia/tasks/prerequisites.yml

@@ -202,6 +202,29 @@
     - hugepage
     - converttohugepage
 
+# Fixes #3
+- name: Check if there are already Oracle instances
+  become: true
+  shell: "cat /etc/oratab 2> /dev/null | grep -v '#' | grep -v -e '^$' | wc -l"
+  changed_when: false
+  register: instance_count
+  when: sysctl_stable | default(false) | bool
+  tags:
+    - db
+    - rdbms
+    - prepare
+    - hugepage
+    - converttohugepage
+
+- debug:
+    var: instance_count
+  tags:
+    - db
+    - rdbms
+    - prepare
+    - hugepage
+    - converttohugepage
+
 - name: Check if Transparent Hugepages are configured
   shell: grep -w transparent_hugepage=never /etc/default/grub
   changed_when: false
@@ -216,15 +239,15 @@
   become: true
   shell: "sysctl -a | grep -w vm.nr_hugepages | grep -o [0-9]*"
   register: current_hugepages
-  when: (sysctl_stable | bool)
+  when: (sysctl_stable | bool) and (instance_count.stdout | int > 0)
   tags:
     - hugepage
 
 - name: Getting current shmall Value
   become: true
   shell: "cat /etc/sysctl.d/97-oracle-db-sysctl.conf | grep shmall | awk -F \"=\" {'print$2'}"
   register: current_shmall
-  when: (sysctl_stable | bool)
+  when: (sysctl_stable | bool) and (instance_count.stdout | int > 0)
   tags:
     - db
     - prepare
@@ -233,7 +256,7 @@
   become: true
   shell: "cat /etc/sysctl.d/97-oracle-db-sysctl.conf | grep shmmax | awk -F \"=\" {'print$2'}"
   register: current_shmmax
-  when: (sysctl_stable | bool)
+  when: (sysctl_stable | bool) and (instance_count.stdout | int > 0)
   tags:
     - db
     - prepare
@@ -251,8 +274,8 @@
 # Only when sysctl is stable
 - name: Calculating OS Kernel Parameter Settings shmall
   set_fact:
-    shmall: "{{ (((sga_max_size|int * 1024 * 1024 * 1024 / 4096) * 1.01) + current_shmall.stdout|int)|int }}"
-  when: ((sysctl_stable | bool) and (shmall|int < ((sga_max_size|int * 1024 * 1024 * 1024 / 4096) * 1.01) + current_shmall.stdout|int))
+    shmall: "{{ (((sga_max_size|int * 1024 * 1024 * 1024 / 4096) * 1.01) + current_shmall.stdout|default(0)|int)|int }}"
+  when: ((sysctl_stable | bool) and (shmall|int < ((sga_max_size|int * 1024 * 1024 * 1024 / 4096) * 1.01) + current_shmall.stdout|default(0)|int))
   tags:
     - db
     - prepare
@@ -266,8 +289,8 @@
 
 - name: Calculating OS Kernel Parameter Settings shmmax
   set_fact:
-    shmmax: "{{ (((sga_max_size|int * 1024 * 1024 * 1024) * 1.01) + current_shmmax.stdout|int)|int }}"
-  when: ((sysctl_stable | bool) and (shmmax|int < ((sga_max_size|int * 1024 * 1024 * 1024) * 1.01) + current_shmmax.stdout|int))
+    shmmax: "{{ (((sga_max_size|int * 1024 * 1024 * 1024) * 1.01) + current_shmmax.stdout|default(0)|int)|int }}"
+  when: ((sysctl_stable | bool) and (shmmax|int < ((sga_max_size|int * 1024 * 1024 * 1024) * 1.01) + current_shmmax.stdout|default(0)|int))
   tags:
     - db
     - prepare
@@ -281,7 +304,7 @@
 
 - name: Calculating Number of Hugepages
   set_fact:
-    hugepages: "{{ (((sga_max_size|int * 1024 / 2) * 1.01) + current_hugepages.stdout|int)|int }}"
+    hugepages: "{{ (((sga_max_size|int * 1024 / 2) * 1.01) + current_hugepages.stdout|default(0)|int)|int }}"
     reboot_required: true
   when: (sysctl_stable | bool)
   tags:
@@ -459,7 +482,7 @@
   changed_when: false
   register: check_selinux_configuration
   become: true
-  when: (not molecule_run | bool | default(false))
+  when: (not molecule_run | default(false) | bool)
   tags:
     - autostart
     - db
@@ -488,7 +511,7 @@
     state: "{{ selinux_desired_state }}"
   register: selinux_configuration_change
   become: true
-  when: '((not molecule_run | bool | default(false)) and ("SELinux state changed" in check_selinux_configuration.msg))'
+  when: '((not molecule_run | default(false) | bool) and ("SELinux state changed" in check_selinux_configuration.msg))'
   tags:
     - autostart
     - db

roles/pythia/vars/main.yml

@@ -28,19 +28,13 @@
 #    sysctl Configuration when deploying a Database
 #  - shmmax (Default 4294967295): Will be calculated during Playbook Runtime. Will be included to the
 #    sysctl Configuration when deploying a Database
-#  - current_shmall (Default 0): Just for initializing the Variable. Must not be modified
-#  - current_shmmax (Default 0): Just for initializing the Variable. Must not be modified
-#  - current_hugepages (Default 0): Just for initializing the Variable. Must not be modified
 #  - hugepages (Default 0): Will be calculated during Playbook Runtime. Will be included to the sysctl
 #    Configuration when deploying a Database
 
 # OS Kernel Parameter Variables. Will be calculated during Playbook Run. Must not be set here
 shmall: 2097152
 shmmax: 4294967295
-current_shmall: 0
-current_shmmax: 0
 hugepages: 0
-current_hugepages: 0
 
 # Stage and Script Directories
 local_stage_directory: /mnt/oracle_stage