From d2c4c4f8a798506ee88d0412ee1ab7cae5f394e5 Mon Sep 17 00:00:00 2001
From: Jan Malanik <janx.malanik@intel.com>
Date: Tue, 21 Nov 2017 11:05:07 -0800
Subject: Bugfix in role enable_hugepages_on_boot

Make role idempotent.
Current regex doesn't match for:
linux   /boot/vmlinuz-4.10.0-30-generic root=/dev/nvme0n1p1 ro vga=788 text

Change-Id: If5eb20fce4ddc35bb109c00eb7565853b3763950
Signed-off-by: Jan Malanik <janx.malanik@intel.com>
Signed-off-by: Malanik Jan <janx.malanik@intel.com>
---
 .../roles/enable_hugepages_on_boot/tasks/main.yml  | 55 ++++++++++++----------
 .../tasks/manual_modify_grub.yml                   | 17 +++----
 .../roles/enable_hugepages_on_boot/vars/main.yml   |  2 +-
 3 files changed, 39 insertions(+), 35 deletions(-)

diff --git a/ansible/roles/enable_hugepages_on_boot/tasks/main.yml b/ansible/roles/enable_hugepages_on_boot/tasks/main.yml
index 29432d2e4..75526eb19 100755
--- a/ansible/roles/enable_hugepages_on_boot/tasks/main.yml
+++ b/ansible/roles/enable_hugepages_on_boot/tasks/main.yml
@@ -31,34 +31,37 @@
     msg: "Hugepages already set by someone else"
   when: is_mine_huge.stdout == "" and is_huge.stdout != ""
 
-- name: use 16 for auto num_hugepages and 1G size
-  set_fact:
-    num_hugepages: 8
-  when: num_hugepages|default("auto") == "auto"
+- name: configure hugepages as idempotent block
+  block:
+    - name: use 8 for auto num_hugepages and 1G size
+      set_fact:
+        num_hugepages: 8
+      when: num_hugepages|default("auto") == "auto"
 
-- name: set hugepages in grub
-  lineinfile:
-    dest: /etc/default/grub
-    regexp: '{{ hugepage_param_regex }}'
-    line: '{{ hugepage_param }}'
-    state: present
+    - name: set hugepages in grub
+      lineinfile:
+        dest: /etc/default/grub
+        regexp: '{{ hugepage_param_regex }}'
+        line: '{{ hugepage_param }}'
+        state: present
 
-- name: create hugetables mount
-  file:
-    path: "{{ hugetable_mount }}"
-    state: directory
+    - name: create hugetables mount
+      file:
+        path: "{{ hugetable_mount }}"
+        state: directory
 
-- name: mount hugetlbfs
-  mount:
-    name: "{{ hugetable_mount }}"
-    src: nodev
-    fstype: hugetlbfs
-    state: present
+    - name: mount hugetlbfs
+      mount:
+        name: "{{ hugetable_mount }}"
+        src: nodev
+        fstype: hugetlbfs
+        state: present
 
-- service:
-    name: procps
-    enabled: yes
+    - service:
+        name: procps
+        enabled: yes
 
-- include: manual_modify_grub.yml
-  # only tested on Ubuntu, kernel line is probably different on other distros
-  when: ansible_distribution == "Ubuntu"
+    - include: manual_modify_grub.yml
+      # only tested on Ubuntu, kernel line is probably different on other distros
+      when: ansible_distribution == "Ubuntu"
+  when: is_mine_huge.stdout == ""
diff --git a/ansible/roles/enable_hugepages_on_boot/tasks/manual_modify_grub.yml b/ansible/roles/enable_hugepages_on_boot/tasks/manual_modify_grub.yml
index cac10e80e..6fa0c1d25 100644
--- a/ansible/roles/enable_hugepages_on_boot/tasks/manual_modify_grub.yml
+++ b/ansible/roles/enable_hugepages_on_boot/tasks/manual_modify_grub.yml
@@ -20,16 +20,17 @@
     recurse: yes
   register: grub_files
 
+- name: check if hugepages are already enabled
+  command: "grep -o 'default_hugepagesz=' {{ item.path }}"
+  register: hugepage_enabled
+  ignore_errors: True
+  with_items: "{{ grub_files.files }}"
 
-- name: added hugepages to grub manually because we can't run update-grub in chroot
+- name: add hugepages to grub manually because we can't run update-grub in chroot
   replace:
     dest: "{{ item.path }}"
-    # console= should end the line
-    regexp: '(linux\s+/boot/vmlinuz.*console=\S+$)'
-    # default_hugepagesz=1G hugepagesz=1G hugepages=8
+    regexp: '(linux\s+/boot/vmlinuz.*$)'
     replace: '\1 default_hugepagesz={{ huge_pagesize_short[huge_pagesize_mb] }} hugepagesz={{ huge_pagesize_short[huge_pagesize_mb] }} hugepages={{ num_hugepages }}'
   with_items: "{{ grub_files.files }}"
-
-
-
-
+  # we suppose consistent /boot/grub/grub.cfg files
+  when:  hugepage_enabled['results'][0].stdout == ""
diff --git a/ansible/roles/enable_hugepages_on_boot/vars/main.yml b/ansible/roles/enable_hugepages_on_boot/vars/main.yml
index acdf02509..6fec347b2 100644
--- a/ansible/roles/enable_hugepages_on_boot/vars/main.yml
+++ b/ansible/roles/enable_hugepages_on_boot/vars/main.yml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ---
-hugepage_param_regex: '^GRUB_CMDLINE_LINUX="\$GRUB_CMDLINE_LINUX.*# added by hugepages role'
+hugepage_param_regex: '^GRUB_CMDLINE_LINUX="\$GRUB_CMDLINE_LINUX.*"  # added by hugepages role'
 hugepage_param: 'GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX default_hugepagesz={{ huge_pagesize_short[huge_pagesize_mb] }} hugepagesz={{ huge_pagesize_short[huge_pagesize_mb] }} hugepages={{ num_hugepages }}"  # added by hugepages role'
 
 update_grub:
-- 
cgit 1.2.3-korg