Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle exceptions in containers when setting sysctl keys #460

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Handle exceptions in containers when setting sysctl keys #460

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d1ccb64
handle exceptions in containers when setting sysctl keys
andrewdmcleod Apr 21, 2020
5bb25af
fix typo
andrewdmcleod Apr 21, 2020
43cecb6
log instead of error
andrewdmcleod Apr 21, 2020
48c2330
fix typo, ERROR to WARNING
andrewdmcleod Apr 21, 2020
a6fc0b2
import WARNING
andrewdmcleod Apr 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions charmhelpers/core/sysctl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,16 @@

import yaml

from subprocess import check_call
from subprocess import check_call, CalledProcessError

from charmhelpers.core.hookenv import (
log,
DEBUG,
ERROR,
)

from charmhelpers.core.host import is_container

__author__ = 'Jorge Niedbalski R. <[email protected]>'


Expand Down Expand Up @@ -62,4 +64,10 @@ def create(sysctl_dict, sysctl_file, ignore=False):
if ignore:
call.append("-e")

check_call(call)
try:
check_call(call)
except CalledProcessError as e:
if is_container():
print("Error setting some systcl keys in this container: {}".format(e.output))
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please can we use logging rather than just print here.

else:
raise e