github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #111083 from nixpanic/mount-utils/no-systemd

Browse Source 
mount-utils: only detect systemd when needed
This commit is contained in:
Kubernetes Prow Robot 2022-07-14 13:18:57 -07:00 committed by GitHub
commit a35c1f37b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
staging/src/k8s.io/mount-utils/mount_linux.go
View File

@ -58,7 +58,7 @@ const (
// kubelet is running in the host's root mount namespace. // kubelet is running in the host's root mount namespace.
type Mounter struct { type Mounter struct {
mounterPath string mounterPath string
withSystemd bool withSystemd *bool
withSafeNotMountedBehavior bool withSafeNotMountedBehavior bool
} }
@ -70,11 +70,21 @@ var _ MounterForceUnmounter = &Mounter{}
func New(mounterPath string) Interface { func New(mounterPath string) Interface {
return &Mounter{ return &Mounter{
mounterPath: mounterPath, mounterPath: mounterPath,
withSystemd: detectSystemd(),
withSafeNotMountedBehavior: detectSafeNotMountedBehavior(), withSafeNotMountedBehavior: detectSafeNotMountedBehavior(),
} }
} }
// hasSystemd validates that the withSystemd bool is set, if it is not,
// detectSystemd will be called once for this Mounter instance.
func (mounter *Mounter) hasSystemd() bool {
if mounter.withSystemd == nil {
withSystemd := detectSystemd()
mounter.withSystemd = &withSystemd
}
return *mounter.withSystemd
}
// Mount mounts source to target as fstype with given options. 'source' and 'fstype' must // Mount mounts source to target as fstype with given options. 'source' and 'fstype' must
// be an empty string in case it's not required, e.g. for remount, or for auto filesystem // be an empty string in case it's not required, e.g. for remount, or for auto filesystem
// type, where kernel handles fstype for you. The mount 'options' is a list of options, // type, where kernel handles fstype for you. The mount 'options' is a list of options,
@ -154,7 +164,7 @@ func (mounter *Mounter) doMount(mounterPath string, mountCmd string, source stri
mountCmd = mounterPath mountCmd = mounterPath
} }
if mounter.withSystemd && systemdMountRequired { if mounter.hasSystemd() && systemdMountRequired {
// Try to run mount via systemd-run --scope. This will escape the // Try to run mount via systemd-run --scope. This will escape the
// service where kubelet runs and any fuse daemons will be started in a // service where kubelet runs and any fuse daemons will be started in a
// specific scope. kubelet service than can be restarted without killing // specific scope. kubelet service than can be restarted without killing

8
staging/src/k8s.io/mount-utils/mount_linux_test.go
View File

@ -525,6 +525,14 @@ func TestSensitiveMountOptions(t *testing.T) {
} }
} }
func TestHasSystemd(t *testing.T) {
mounter := &Mounter{}
_ = mounter.hasSystemd()
if mounter.withSystemd == nil {
t.Error("Failed to run detectSystemd()")
}
}
func mountArgsContainString(t *testing.T, mountArgs []string, wanted string) bool { func mountArgsContainString(t *testing.T, mountArgs []string, wanted string) bool {
for _, mountArg := range mountArgs { for _, mountArg := range mountArgs {
if mountArg == wanted { if mountArg == wanted {