Merge pull request #5865 from planetscale/ds-tablet-topo-update-ctx

Use a timeout to update topo during vttablet shutdown
vitessio · Feb 27, 2020 · aa9915a · aa9915a
2 parents ad4e47a + 2f20bbc
commit aa9915a
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/go/vt/vttablet/tabletmanager/action_agent.go b/go/vt/vttablet/tabletmanager/action_agent.go
@@ -770,7 +770,11 @@ func (agent *ActionAgent) Close() {
 		tablet.PortMap = nil
 		return nil
 	}
-	if _, err := agent.TopoServer.UpdateTabletFields(context.Background(), agent.TabletAlias, f); err != nil {
+
+	updateCtx, updateCancel := context.WithTimeout(context.Background(), *topo.RemoteOperationTimeout)
+	defer updateCancel()
+
+	if _, err := agent.TopoServer.UpdateTabletFields(updateCtx, agent.TabletAlias, f); err != nil {
 		log.Warningf("Failed to update tablet record, may contain stale identifiers: %v", err)
 	}
 }