Skip to content

Hotfix panic during closeUnused #33

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

Merged
merged 2 commits into from
Sep 26, 2024
Merged

Hotfix panic during closeUnused #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd0e378
tableroll: don't close unused fds; hotfix for concurrent map access
natasha-jarus Sep 26, 2024
47e6f1d
fds: make String() concurrency-safe
natasha-jarus Sep 26, 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
7 changes: 4 additions & 3 deletions fds.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,9 +131,10 @@ type Fds struct {
l log15.Logger
}

func (f *Fds) String() string {
res := make([]string, 0, len(f.fds))
for _, fi := range f.fds {
func (f *Fds) String() string { // XXX here?
fds := f.copy()
res := make([]string, 0, len(fds))
for _, fi := range fds {
res = append(res, fi.String())
}
return fmt.Sprintf("fds: %v", res)
Expand Down
6 changes: 3 additions & 3 deletions upgrader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,9 +240,9 @@ func (u *Upgrader) Ready() error {
}

// Now cleanup all old FDs while holding the lock
u.Fds.lockMutations(errors.New("closing old listeners"))
defer u.Fds.unlockMutations()
_ = u.Fds.closeUnused()
//u.Fds.lockMutations(errors.New("closing old listeners"))
// defer u.Fds.unlockMutations()
//_ = u.Fds.closeUnused()

return nil
}
Expand Down
Loading