Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mount: exit when the file system changes #4555

Merged
merged 4 commits into from
Mar 22, 2024
Merged

mount: exit when the file system changes #4555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f38f3e8
exit when the file system changes
zhijian-pro Mar 21, 2024
bbad3f4
Revert "exit when the file system changes"
zhijian-pro Mar 22, 2024
5deaefa
perform umount when exiting with special status codes
zhijian-pro Mar 22, 2024
5c05edf
fix
zhijian-pro Mar 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions cmd/mount_unix.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -698,12 +698,21 @@ func launchMount(mp string, conf *vfs.Config) error {
cancel()
if err == nil {
return nil
} else {
var exitError *exec.ExitError
if ok := errors.As(err, &exitError); ok {
if waitStatus, ok := exitError.Sys().(syscall.WaitStatus); ok && waitStatus.ExitStatus() == meta.UmountCode {
logger.Errorf("received umount exit code")
_ = doUmount(mp, true)
return nil
}
}
if fuseFd < 0 {
logger.Info("transfer FUSE session to others")
return nil
}
time.Sleep(time.Second)
}
if fuseFd < 0 {
logger.Info("transfer FUSE session to others")
return nil
}
time.Sleep(time.Second)
}
}

Expand Down
12 changes: 10 additions & 2 deletions pkg/meta/base.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,6 +550,8 @@ func (m *baseMeta) OnReload(fn func(f *Format)) {
m.reloadCb = append(m.reloadCb, fn)
}

const UmountCode = 11

func (m *baseMeta) refresh() {
for {
if m.conf.Heartbeat > 0 {
Expand All @@ -571,11 +573,17 @@ func (m *baseMeta) refresh() {

old := m.getFormat()
if format, err := m.Load(false); err != nil {
if strings.HasPrefix(err.Error(), "database is not formatted") {
logger.Errorf("reload setting: %s", err)
os.Exit(UmountCode)
}
logger.Warnf("reload setting: %s", err)
} else if format.MetaVersion > MaxVersion {
logger.Fatalf("incompatible metadata version %d > max version %d", format.MetaVersion, MaxVersion)
logger.Errorf("incompatible metadata version %d > max version %d", format.MetaVersion, MaxVersion)
os.Exit(UmountCode)
} else if format.UUID != old.UUID {
logger.Fatalf("UUID changed from %s to %s", old, format.UUID)
logger.Errorf("UUID changed from %s to %s", old.UUID, format.UUID)
os.Exit(UmountCode)
} else if !reflect.DeepEqual(format, old) {
m.msgCallbacks.Lock()
cbs := m.reloadCb
Expand Down
Loading