mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-12-18 11:00:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: reduce systemd related errors while mounting

Browse Source 
There are regular reports that identify a non-error as the cause of
failures. The Kubernetes mount-utils package has detection for systemd
based environments, and if systemd is unavailable, the following error
is logged:

    Cannot run systemd-run, assuming non-systemd OS
    systemd-run output: System has not been booted with systemd as init
    system (PID 1). Can't operate.
    Failed to create bus connection: Host is down, failed with: exit status 1

Because of the `failed` and `exit status 1` error message, users might
assume that the mounting failed. This does not need to be the case. The
container-images that the Ceph-CSI projects provides, do not use
systemd, so the error will get logged with each mount attempt.

By using the newer MountSensitiveWithoutSystemd() function from the
mount-utils package where we can, the number of confusing logs get
reduced.

Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Niels de Vos 2022-06-29 15:53:55 +02:00 committed by mergify[bot]
parent a1ed6207f6
commit 14ba1498bf
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/rbd/nodeserver.go
View File

@ -773,7 +773,7 @@ func (ns *NodeServer) mountVolumeToStagePath(
if isBlock { if isBlock {
opt = append(opt, "bind") opt = append(opt, "bind")
err = diskMounter.Mount(devicePath, stagingPath, fsType, opt) err = diskMounter.MountSensitiveWithoutSystemd(devicePath, stagingPath, fsType, opt, nil)
} else { } else {
err = diskMounter.FormatAndMount(devicePath, stagingPath, fsType, opt) err = diskMounter.FormatAndMount(devicePath, stagingPath, fsType, opt)
} }

2
internal/util/util.go
View File

@ -330,7 +330,7 @@ func ReadMountInfoForProc(proc string) ([]mount.MountInfo, error) {
func Mount(source, target, fstype string, options []string) error { func Mount(source, target, fstype string, options []string) error {
dummyMount := mount.New("") dummyMount := mount.New("")
return dummyMount.Mount(source, target, fstype, options) return dummyMount.MountSensitiveWithoutSystemd(source, target, fstype, options, nil)
} }
// MountOptionsAdd adds the `add` mount options to the `options` and returns a // MountOptionsAdd adds the `add` mount options to the `options` and returns a