Skip to content

Fix for refreshing schema after update #3574

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 2 commits into from
Jan 23, 2018
+2 −2
Merged

Fix for refreshing schema after update #3574

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
d1e5a57
Fix for refreshing schema after update
Jan 23, 2018
2c0aaa9
Fixes test that asserts that changes to vschema are updated correctly…
Jan 23, 2018
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 go/vt/srvtopo/resilient_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ func (server *ResilientServer) WatchSrvVSchema(ctx context.Context, cell string,
} else {
for c := range changes {
// Note we forward topo.ErrNoNode as is.
callback(nil, c.Err)
callback(c.Value, c.Err)
if c.Err != nil {
log.Warningf("Error while watching vschema for cell %s (will wait 5s before retrying): %v", cell, c.Err)
break
Expand Down
2 changes: 1 addition & 1 deletion go/vt/srvtopo/resilient_server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ func TestWatchSrvVSchema(t *testing.T) {
// Update value, wait for it.
updatedValue := &vschemapb.SrvVSchema{
Keyspaces: map[string]*vschemapb.Keyspace{
"ks1": {},
"ks2": {},
},
}
if err := ts.UpdateSrvVSchema(ctx, "test_cell", updatedValue); err != nil {
Expand Down