yacloud/tunasync
1
0
Fork 0
mirror of https://github.com/tuna/tunasync.git synced 2025-06-15 14:12:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

cgroupv2: bypass RequireDevices check

Browse Source
This commit is contained in:
Miao Wang 2021-07-27 01:30:16 +08:00
parent c26e9fb64a
commit 1bc0285905
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/tunasync.yml vendored
View File

@ -63,7 +63,7 @@ jobs:
- name: Run Additional Unit tests. - name: Run Additional Unit tests.
run: | run: |
make build-test-worker make build-test-worker
sudo cgexec -g "*:/" -g cpu,memory:tunasync bash -c "echo 0 > /sys/fs/cgroup/systemd/tasks; exec sudo -u $USER env USECURCGROUP=1 ./worker.test -test.v -test.coverprofile profile.cov -test.run TestCgroup" sudo cgexec -g "*:/" bash -c "echo 0 > /sys/fs/cgroup/systemd/tasks; exec sudo -u $USER env USECURCGROUP=1 cgexec -g cpu,memory:tunasync ./worker.test -test.v -test.coverprofile profile.cov -test.run TestCgroup"
- name: Convert coverage to lcov - name: Convert coverage to lcov
uses: jandelgado/gcov2lcov-action@v1.0.0 uses: jandelgado/gcov2lcov-action@v1.0.0

5
worker/cgroup.go
View File

@ -167,7 +167,10 @@ func initCgroup(cfg *cgroupConfig) (error) {
} }
logger.Infof("Loading cgroup") logger.Infof("Loading cgroup")
var err error var err error
if cfg.cgMgrV1, err = cgv1.Load(cgv1.V1, pather); err != nil { if cfg.cgMgrV1, err = cgv1.Load(cgv1.V1, pather, func(cfg *cgv1.InitConfig) error{
cfg.InitCheck = cgv1.AllowAny
return nil
}); err != nil {
return err return err
} }
logger.Debugf("Available subsystems:") logger.Debugf("Available subsystems:")

5
worker/cgroup_test.go
View File

@ -231,7 +231,10 @@ sleep 30
return path, err return path, err
} }
})(cgv1.NestedPath("")) })(cgv1.NestedPath(""))
wkrMgr, err := cgv1.Load(cgv1.V1, pather) wkrMgr, err := cgv1.Load(cgv1.V1, pather, func(cfg *cgv1.InitConfig) error{
cfg.InitCheck = cgv1.AllowAny
return nil
})
So(err, ShouldBeNil) So(err, ShouldBeNil)
origMgr := cgcf.cgMgrV1 origMgr := cgcf.cgMgrV1
for _, subsys := range(wkrMgr.Subsystems()){ for _, subsys := range(wkrMgr.Subsystems()){