rancher/immucore
1
0
Fork 0
mirror of https://github.com/kairos-io/immucore.git synced 2025-09-21 03:00:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove defaults from bind and extra logging

Browse Source 
Signed-off-by: Itxaka <itxaka@spectrocloud.com>
This commit is contained in:
Itxaka
2023-02-08 12:21:05 +01:00
parent 6fedeef4ea
commit 45c69d24fa
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/mount/fs.go
View File

@@ -111,7 +111,7 @@ func mountBind(mountpoint, root, stateTarget string) (mountOperation, error) {
Type: "overlay", Type: "overlay",
Source: stateDir, Source: stateDir,
Options: []string{ Options: []string{
"defaults", //"defaults",
"bind", "bind",
}, },
} }

23
pkg/mount/mount.go
View File

@@ -79,7 +79,7 @@ func (s *State) WriteFstab(fstabFile string) func(context.Context) error {
if _, err := f.WriteString(toWrite); err != nil { if _, err := f.WriteString(toWrite); err != nil {
return err return err
} }
log.Logger.Debug().Str("fstabline", litter.Sdump(fstCleaned)).Str("fstabfile", fstabFile).Msg("Done fstab line") log.Logger.Debug().Str("fstabline", fstCleaned).Str("fstabfile", fstabFile).Msg("Done fstab line")
} }
} }
return nil return nil
@@ -117,10 +117,10 @@ func (s *State) MountOP(what, where, t string, options []string, timeout time.Du
select { select {
default: default:
if _, err := os.Stat(where); os.IsNotExist(err) { if _, err := os.Stat(where); os.IsNotExist(err) {
log.Logger.Debug().Str("what", what).Str("where", where).Str("type", t).Str("options", litter.Sdump(options)).Msg("Mount point does not exist, creating") log.Logger.Debug().Str("what", what).Str("where", where).Str("type", t).Strs("options", options).Msg("Mount point does not exist, creating")
err = os.MkdirAll(where, os.ModeDir|os.ModePerm) err = os.MkdirAll(where, os.ModeDir|os.ModePerm)
if err != nil { if err != nil {
log.Logger.Debug().Str("what", what).Str("where", where).Str("type", t).Str("options", litter.Sdump(options)).Err(err).Msg("Creating dir") log.Logger.Debug().Str("what", what).Str("where", where).Str("type", t).Strs("options", options).Err(err).Msg("Creating dir")
continue continue
} }
} }
@@ -140,20 +140,20 @@ func (s *State) MountOP(what, where, t string, options []string, timeout time.Du
err := op.run() err := op.run()
if err != nil { if err != nil {
log.Logger.Debug().Str("what", what).Str("where", where).Str("type", t).Str("options", litter.Sdump(options)).Err(err).Msg("mounting") log.Logger.Debug().Str("what", what).Str("where", where).Str("type", t).Strs("options", options).Err(err).Msg("mounting")
continue continue
} }
s.fstabs = append(s.fstabs, tmpFstab) s.fstabs = append(s.fstabs, tmpFstab)
log.Logger.Debug().Str("what", what).Str("where", where).Str("type", t).Str("options", litter.Sdump(options)).Msg("Mounted") log.Logger.Debug().Str("what", what).Str("where", where).Str("type", t).Strs("options", options).Msg("Mounted")
return nil return nil
case <-c.Done(): case <-c.Done():
e := fmt.Errorf("context canceled") e := fmt.Errorf("context canceled")
log.Logger.Debug().Str("what", what).Str("where", where).Str("type", t).Str("options", litter.Sdump(options)).Err(e).Msg("mount canceled") log.Logger.Debug().Str("what", what).Str("where", where).Str("type", t).Strs("options", options).Err(e).Msg("mount canceled")
return e return e
case <-cc: case <-cc:
e := fmt.Errorf("timeout exhausted") e := fmt.Errorf("timeout exhausted")
log.Logger.Debug().Str("what", what).Str("where", where).Str("type", t).Str("options", litter.Sdump(options)).Err(e).Msg("Mount timeout") log.Logger.Debug().Str("what", what).Str("where", where).Str("type", t).Strs("options", options).Err(e).Msg("Mount timeout")
return e return e
} }
} }
@@ -275,6 +275,7 @@ func (s *State) Register(g *herd.Graph) error {
// depending on /run/cos-layout.env // depending on /run/cos-layout.env
// This is building the mountRoot dependendency if it was enabled // This is building the mountRoot dependendency if it was enabled
mountRootCondition := herd.ConditionalOption(func() bool { return s.MountRoot }, herd.WithDeps(opMountRoot)) mountRootCondition := herd.ConditionalOption(func() bool { return s.MountRoot }, herd.WithDeps(opMountRoot))
s.Logger.Debug().Bool("mountRootCondition", s.MountRoot).Msg("condition")
// TODO: this needs to be run after sysroot so we can link to /sysroot/system/oem and after /oem mounted // TODO: this needs to be run after sysroot so we can link to /sysroot/system/oem and after /oem mounted
s.Logger.Debug().Str("what", opRootfsHook).Msg("Add operation") s.Logger.Debug().Str("what", opRootfsHook).Msg("Add operation")
@@ -304,6 +305,8 @@ func (s *State) Register(g *herd.Graph) error {
// TODO: PERSISTENT_STATE_TARGET /usr/local/.state // TODO: PERSISTENT_STATE_TARGET /usr/local/.state
s.BindMounts = strings.Split(env["PERSISTENT_STATE_PATHS"], " ") s.BindMounts = strings.Split(env["PERSISTENT_STATE_PATHS"], " ")
log.Logger.Debug().Strs("paths", s.BindMounts).Msg("persistent paths")
log.Logger.Debug().Str("pathsraw", env["PERSISTENT_STATE_PATHS"]).Msg("persistent paths")
s.StateDir = env["PERSISTENT_STATE_TARGET"] s.StateDir = env["PERSISTENT_STATE_TARGET"]
if s.StateDir == "" { if s.StateDir == "" {
@@ -359,6 +362,7 @@ func (s *State) Register(g *herd.Graph) error {
} }
overlayCondition := herd.ConditionalOption(func() bool { return rootFSType(s.Rootdir) != "overlay" }, herd.WithDeps(opMountBaseOverlay)) overlayCondition := herd.ConditionalOption(func() bool { return rootFSType(s.Rootdir) != "overlay" }, herd.WithDeps(opMountBaseOverlay))
s.Logger.Debug().Bool("overlaycondition", rootFSType(s.Rootdir) != "overlay").Msg("condition")
// TODO: Add fsck // TODO: Add fsck
// mount overlay // mount overlay
s.Logger.Debug().Str("what", opOverlayMount).Msg("Add operation") s.Logger.Debug().Str("what", opOverlayMount).Msg("Add operation")
@@ -432,11 +436,14 @@ func (s *State) Register(g *herd.Graph) error {
herd.WithCallback( herd.WithCallback(
func(ctx context.Context) error { func(ctx context.Context) error {
var err error var err error
s.Logger.Debug().Msg("Mounting bind")
s.Logger.Debug().Strs("binds", s.BindMounts).Msg("Mounting bind")
for _, p := range s.BindMounts { for _, p := range s.BindMounts {
s.Logger.Debug().Str("what", p).Str("where", s.StateDir).Msg("Mounting bind")
op, err := mountBind(p, s.Rootdir, s.StateDir) op, err := mountBind(p, s.Rootdir, s.StateDir)
if err != nil { if err != nil {
s.Logger.Err(err).Msg("Mounting bind")
return err return err
} }
s.fstabs = append(s.fstabs, &op.FstabEntry) s.fstabs = append(s.fstabs, &op.FstabEntry)