Skip to content

[IGNORE] Debug VolumeLs failure on Windows #3274

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

Closed
apostasie wants to merge 1 commit into from
Closed

[IGNORE] Debug VolumeLs failure on Windows #3274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 10 additions & 1 deletion pkg/lockutil/lockutil_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,22 +45,31 @@ func WithDirLock(dir string, fn func() error) error {
}

func Lock(dir string) (*os.File, error) {
log.L.Error("[LOCK] About to lock", dir)
dirFile, err := os.OpenFile(dir+".lock", os.O_CREATE, 0644)
log.L.Error("[LOCK] Opened", dir)
if err != nil {
return nil, err
}
// see https://msdn.microsoft.com/en-us/library/windows/desktop/aa365203(v=vs.85).aspx
// 1 lock immediately
log.L.Error("[LOCK] Locking", dir)
if err = windows.LockFileEx(windows.Handle(dirFile.Fd()), 1, 0, 1, 0, &windows.Overlapped{}); err != nil {
log.L.Error("[LOCK] Failed", dir)
return nil, fmt.Errorf("failed to lock %q: %w", dir, err)
}
log.L.Error("[LOCK] Success", dir)
return dirFile, nil
}

func Unlock(locked *os.File) error {
log.L.Error("[UNLOCK] About to close", locked.Name())
defer func() {
_ = locked.Close()
}()

return windows.UnlockFileEx(windows.Handle(locked.Fd()), 0, 1, 0, &windows.Overlapped{})
log.L.Error("[UNLOCK] About to unlock", locked.Name())
err := windows.UnlockFileEx(windows.Handle(locked.Fd()), 0, 1, 0, &windows.Overlapped{})
log.L.Error("[UNLOCK] Unlocked", locked.Name())
return err
}
9 changes: 9 additions & 0 deletions pkg/mountutil/volumestore/volumestore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,9 +217,12 @@ func (vs *volumeStore) Get(name string, size bool) (*native.Volume, error) {

var err error
if vs.locked == nil {
log.L.Error("[VOLGET] NEED TO LOCK")
err = lockutil.WithDirLock(vs.dir, fn)
} else {
log.L.Error("[VOLGET] RUNNING (no extra locking)")
err = fn()
log.L.Error("[VOLGET] DONE")
}
if err != nil {
return nil, err
Expand All @@ -234,25 +237,31 @@ func (vs *volumeStore) List(size bool) (map[string]native.Volume, error) {
res := map[string]native.Volume{}

fn := func() error {
log.L.Error("[VOLLS] running list")
dirEntries, err := os.ReadDir(vs.dir)
if err != nil {
return fmt.Errorf("filesystem error while trying to list volumes from the volume store: %w", err)
}

for _, dirEntry := range dirEntries {
name := dirEntry.Name()
log.L.Error("[VOLLS] going to get")
vol, err := vs.Get(name, size)
log.L.Error("[VOLLS] done with get")
if err != nil {
return err
}
res[name] = *vol
}
log.L.Error("[VOLLS] returning list")
return nil
}

var err error
// Since we are calling Get, we need to acquire a global lock
log.L.Error("[VOLLS] about to ls")
if vs.locked == nil {
log.L.Error("[VOLLS] locking")
err = vs.Lock()
if err != nil {
return nil, err
Expand Down