airship
/
divingbell
Code Issues Proposed changes

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
This commit is contained in:
skovaleff 2018-11-02 11:36:39 -07:00 committed by Anderson, Craig (ca846m)
parent 7ed8c29f99
commit eebedea5f2
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
divingbell/templates/bin/_limits.sh.tpl
View File

@ -57,7 +57,7 @@ add_limits_param(){
log.INFO "No changes made to limits param: ${limit}" log.INFO "No changes made to limits param: ${limit}"
fi fi
curr_settings="${curr_settings}${file_name}"$'\n' curr_limits="${curr_limits}${file_name}"$'\n'
} }
{{- range $index, $limit := .Values.conf.limits }} {{- 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 # Revert any previously applied limits settings which are now absent
prev_files="$(find "${persist_path}" -type f)" prev_files="$(find "${persist_path}" -type f)"
if [ -n "${prev_files}" ]; then if [ -n "${prev_files}" ]; then
basename -a ${prev_files} | sort > /tmp/prev_settings basename -a ${prev_files} | sort > /tmp/prev_limits
echo "${curr_settings}" | sort > /tmp/curr_settings echo "${curr_limits}" | sort > /tmp/curr_limits
revert_list="$(comm -23 /tmp/prev_settings /tmp/curr_settings)" revert_list="$(comm -23 /tmp/prev_limits /tmp/curr_limits)"
IFS=$'\n' IFS=$'\n'
for orig_limits_setting in ${revert_list}; do for orig_limits_setting in ${revert_list}; do
rm "${persist_path}/${orig_limits_setting}" 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 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. # 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.' log.INFO 'All limits configuration successfully validated on this node.'
else else
log.WARN 'No limits overrides defined for this node.' log.WARN 'No limits overrides defined for this node.'

4
divingbell/templates/bin/_sysctl.sh.tpl
View File

@ -103,10 +103,10 @@ if [ -n "${prev_files}" ]; then
for orig_sysctl_setting in ${revert_list}; do for orig_sysctl_setting in ${revert_list}; do
rm "${persist_path}/${orig_sysctl_setting}" rm "${persist_path}/${orig_sysctl_setting}"
sysctl -p "${defaults_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:" \ log.INFO "Reverted sysctl setting:" \
"$(cat "${defaults_path}/${orig_sysctl_setting}")" "$(cat "${defaults_path}/${orig_sysctl_setting}")"
rm "${defaults_path}/${orig_sysctl_setting}"
reload_system_configs=true
done done
fi fi