8f453a2dda
The CNI daemon should always be run in its own cgroup. That typically can take two forms: - Running inside a container - Running as a systemd service This patch changes the way the memory usage is tracked so that both of the cgroup memberships listed above are supported. Thanks to using cgroups for tracking the memory usage, we will finally take into account the CNI daemon children memory usage. Change-Id: I0ef48742653d5c17ea0cc787ae3a997d5d315c5a Closes-Bug: 1752939 Signed-off-by: Antoni Segura Puimedon <antonisp@celebdor.com>
35 lines
1.4 KiB
Python
35 lines
1.4 KiB
Python
# Copyright Red Hat, Inc. 2018
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
import tempfile
|
|
|
|
import ddt
|
|
from kuryr_kubernetes.cni import utils
|
|
from kuryr_kubernetes.tests import base
|
|
|
|
|
|
@ddt.ddt
|
|
class TestCNIUtils(base.TestCase):
|
|
@ddt.data(*utils.CONTAINER_RUNTIME_CGROUP_IDS)
|
|
def test_running_under_container_runtime(self, container_runtime_id):
|
|
with tempfile.NamedTemporaryFile() as proc_one_cgroup:
|
|
proc_one_cgroup.write(container_runtime_id.encode())
|
|
proc_one_cgroup.write(b'\n')
|
|
proc_one_cgroup.flush()
|
|
self.assertTrue(
|
|
utils.running_under_container_runtime(proc_one_cgroup.name))
|
|
|
|
def test_not_running_under_container_runtime(self):
|
|
with tempfile.NamedTemporaryFile() as proc_one_cgroup:
|
|
self.assertFalse(
|
|
utils.running_under_container_runtime(proc_one_cgroup.name))
|