This is an automated email from the ASF dual-hosted git repository. bmahler pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mesos.git
commit 2f545b11253800c33fa4d1fde073227deb772f89 Author: Jason Zhou <[email protected]> AuthorDate: Wed Jul 31 15:51:32 2024 -0700 [cgroups2] create device controller in Cgroups2Isolator. DeviceController needs to be created in Cgroups2Isolator with the DeviceManager so that the default whitelist can be properly configured. Review: https://reviews.apache.org/r/75121/ --- src/slave/containerizer/mesos/isolators/cgroups2/cgroups2.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/slave/containerizer/mesos/isolators/cgroups2/cgroups2.cpp b/src/slave/containerizer/mesos/isolators/cgroups2/cgroups2.cpp index 3cf3645c4..5e2856437 100644 --- a/src/slave/containerizer/mesos/isolators/cgroups2/cgroups2.cpp +++ b/src/slave/containerizer/mesos/isolators/cgroups2/cgroups2.cpp @@ -22,6 +22,7 @@ #include "slave/containerizer/mesos/isolators/cgroups2/controllers/cpu.hpp" #include "slave/containerizer/mesos/isolators/cgroups2/controllers/memory.hpp" #include "slave/containerizer/mesos/isolators/cgroups2/controllers/perf_event.hpp" +#include "slave/containerizer/mesos/isolators/cgroups2/controllers/devices.hpp" #include <set> #include <string> @@ -84,9 +85,12 @@ Try<Isolator*> Cgroups2IsolatorProcess::create( {"perf_event", &PerfEventControllerProcess::create} }; - hashmap<string, Try<Owned<ControllerProcess>>(*) - (const Flags&, const Owned<DeviceManager>)> - creatorsWithDeviceManager = {}; + hashmap<string, Try<Owned<ControllerProcess>>(*)( + const Flags&, + const Owned<DeviceManager>)> + creatorsWithDeviceManager = { + {"devices", &DeviceControllerProcess::create}, + }; hashmap<string, Owned<Controller>> controllers;
