From eebedea5f2fb70c73851f94da4dfd71586236a23 Mon Sep 17 00:00:00 2001
From: skovaleff <sk607s@att.com>
Date: Fri, 2 Nov 2018 11:36:39 -0700
Subject: [PATCH] Make specific module internal filenames for limits

Avoid filename collision between limits and sysctl module.

Bugfix for sysctl to print reverted setting before it's deleted.

Change-Id: I31269c413f884a25ecf3588b52677ca427b4c082
---
 divingbell/templates/bin/_limits.sh.tpl | 10 +++++-----
 divingbell/templates/bin/_sysctl.sh.tpl |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/divingbell/templates/bin/_limits.sh.tpl b/divingbell/templates/bin/_limits.sh.tpl
index 3e8f4e3..0776fdd 100644
--- a/divingbell/templates/bin/_limits.sh.tpl
+++ b/divingbell/templates/bin/_limits.sh.tpl
@@ -57,7 +57,7 @@ add_limits_param(){
     log.INFO "No changes made to limits param: ${limit}"
   fi
 
-  curr_settings="${curr_settings}${file_name}"$'\n'
+  curr_limits="${curr_limits}${file_name}"$'\n'
 }
 
 {{- range $index, $limit := .Values.conf.limits }}
@@ -68,9 +68,9 @@ add_limits_param {{ $index | squote }} {{ $limit.domain | squote }} {{ $limit.ty
 # Revert any previously applied limits settings which are now absent
 prev_files="$(find "${persist_path}" -type f)"
 if [ -n "${prev_files}" ]; then
-  basename -a ${prev_files} | sort > /tmp/prev_settings
-  echo "${curr_settings}" | sort > /tmp/curr_settings
-  revert_list="$(comm -23 /tmp/prev_settings /tmp/curr_settings)"
+  basename -a ${prev_files} | sort > /tmp/prev_limits
+  echo "${curr_limits}" | sort > /tmp/curr_limits
+  revert_list="$(comm -23 /tmp/prev_limits /tmp/curr_limits)"
   IFS=$'\n'
   for orig_limits_setting in ${revert_list}; do
     rm "${persist_path}/${orig_limits_setting}"
@@ -87,7 +87,7 @@ su -c "prlimit --noheadings --output RESOURCE,SOFT,HARD"
 # For this test it's just test bash process.
 # For production case it's limits_host.sh run by DivingBell pod which is in sleep mode.
 
-if [ -n "${curr_settings}" ]; then
+if [ -n "${curr_limits}" ]; then
   log.INFO 'All limits configuration successfully validated on this node.'
 else
   log.WARN 'No limits overrides defined for this node.'
diff --git a/divingbell/templates/bin/_sysctl.sh.tpl b/divingbell/templates/bin/_sysctl.sh.tpl
index 5a6d0d1..064f68b 100644
--- a/divingbell/templates/bin/_sysctl.sh.tpl
+++ b/divingbell/templates/bin/_sysctl.sh.tpl
@@ -103,10 +103,10 @@ if [ -n "${prev_files}" ]; then
   for orig_sysctl_setting in ${revert_list}; do
     rm "${persist_path}/${orig_sysctl_setting}"
     sysctl -p "${defaults_path}/${orig_sysctl_setting}"
-    rm "${defaults_path}/${orig_sysctl_setting}"
-    reload_system_configs=true
     log.INFO "Reverted sysctl setting:" \
              "$(cat "${defaults_path}/${orig_sysctl_setting}")"
+    rm "${defaults_path}/${orig_sysctl_setting}"
+    reload_system_configs=true
   done
 fi