Commit 02b9607e authored by Tomáš Peterka's avatar Tomáš Peterka Committed by Rafael Monnerat

[format] cgroup are managed solely by root user and slapformat

parent 72aefc89
...@@ -271,7 +271,6 @@ class CGroupManager(Manager): ...@@ -271,7 +271,6 @@ class CGroupManager(Manager):
:param computer: slapos.format.Computer, extract necessary attributes :param computer: slapos.format.Computer, extract necessary attributes
""" """
self.instance_root = computer.instance_root self.instance_root = computer.instance_root
self.software_gid = computer.software_gid
logger.info("Allowing " + self.__class__.__name__) logger.info("Allowing " + self.__class__.__name__)
def __str__(self): def __str__(self):
...@@ -315,8 +314,6 @@ class CGroupManager(Manager): ...@@ -315,8 +314,6 @@ class CGroupManager(Manager):
fx.write("1") # manages it exclusively fx.write("1") # manages it exclusively
with open(cpu_path + "/cpuset.mems", "wt") as fx: with open(cpu_path + "/cpuset.mems", "wt") as fx:
fx.write("0") # it doesn't work without that fx.write("0") # it doesn't work without that
os.chown(cpu_path + "/tasks", -1, self.software_gid)
os.chmod(cpu_path + "/tasks", 0o664)
def ensure_exlusive_cpu(self): def ensure_exlusive_cpu(self):
"""Move processes among exclusive CPUSets based on software release demands. """Move processes among exclusive CPUSets based on software release demands.
...@@ -416,7 +413,6 @@ class CGroupManager(Manager): ...@@ -416,7 +413,6 @@ class CGroupManager(Manager):
"""If-Create folder and set group write permission.""" """If-Create folder and set group write permission."""
if not os.path.exists(folder): if not os.path.exists(folder):
os.mkdir(folder) os.mkdir(folder)
os.chown(folder, -1, self.software_gid)
# make your life and testing easier and create mandatory files if they don't exist # make your life and testing easier and create mandatory files if they don't exist
mandatory_file_list = ("tasks", "cpuset.cpus") mandatory_file_list = ("tasks", "cpuset.cpus")
for mandatory_file in mandatory_file_list: for mandatory_file in mandatory_file_list:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment