Skip to content

Fix panic in unique persistable channel queue #16072

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 3 commits into from
Jun 5, 2021
Merged

Fix panic in unique persistable channel queue #16072

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2dc3963
Fix panic
zeripath Jun 5, 2021
89f6871
Merge branch 'main' into fix-16071
zeripath Jun 5, 2021
6e651f9
Merge branch 'main' into fix-16071
zeripath Jun 5, 2021
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
2 changes: 1 addition & 1 deletion modules/queue/unique_queue_disk_channel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ func (q *PersistableChannelUniqueQueue) Run(atShutdown, atTerminate func(func())
go q.internal.Run(func(_ func()) {}, func(_ func()) {})
go func() {
_ = q.internal.Flush(0)
log.Debug("LevelUniqueQueue: %s flushed so shutting down", q.internal.(*LevelQueue).Name())
Copy link
Member

@lunny lunny Jun 5, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I want to know if line 197 also may panic?

Copy link
Contributor Author

@zeripath zeripath Jun 5, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nope it can't

Copy link
Member

@lunny lunny Jun 5, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But it also q.internal.(*LevelUniqueQueue) when luq, ok := q.internal.(*LevelUniqueQueue); !ok

Copy link
Contributor Author

@zeripath zeripath Jun 5, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's only assigned to LevelUniqueQueue.

Copy link
Member

@lunny lunny Jun 5, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so maybe if q.internal.(*LevelUniqueQueue).ByteFIFOUniqueQueue.byteFIFO.Len(luq.shutdownCtx) != 0 will not make confusion.

log.Debug("LevelUniqueQueue: %s flushed so shutting down", q.internal.(*LevelUniqueQueue).Name())
q.internal.(*LevelUniqueQueue).Shutdown()
GetManager().Remove(q.internal.(*LevelUniqueQueue).qid)
}()
Expand Down