Skip to content

add recover in WatchSrvVSchema and GetSrvKeyspaceNames #6051

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
sougou merged 1 commit into from
Apr 12, 2020
Merged

add recover in WatchSrvVSchema and GetSrvKeyspaceNames #6051

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
12 changes: 12 additions & 0 deletions go/vt/srvtopo/resilient_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,12 @@ func (server *ResilientServer) GetSrvKeyspaceNames(ctx context.Context, cell str
entry.refreshingChan = make(chan struct{})
entry.lastQueryTime = time.Now()
go func() {
defer func() {
if err := recover(); err != nil {
log.Errorf("GetSrvKeyspaceNames uncaught panic, cell :%v, err :%v)", cell, err)
}
}()

result, err := server.topoServer.GetSrvKeyspaceNames(ctx, cell)

entry.mutex.Lock()
Expand Down Expand Up @@ -526,6 +532,12 @@ func (server *ResilientServer) WatchSrvVSchema(ctx context.Context, cell string,
wg.Add(1)

go func() {
defer func() {
if err := recover(); err != nil {
log.Errorf("WatchSrvVSchema uncaught panic, cell :%v, err :%v)", cell, err)
}
}()

foundFirstValue := false

for {
Expand Down