Skip to content

Instantly share code, notes, and snippets.

@dasl-

dasl-/foo.diff

Created September 19, 2019 23:18
Show Gist options
  • Save dasl-/31c974852d0da08c9fda0fc9788ad348 to your computer and use it in GitHub Desktop.
Save dasl-/31c974852d0da08c9fda0fc9788ad348 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
foo.diff
diff --git a/go/vt/vttablet/tabletserver/tabletserver.go b/go/vt/vttablet/tabletserver/tabletserver.go
index 64711af9b..319783a31 100644
--- a/go/vt/vttablet/tabletserver/tabletserver.go
+++ b/go/vt/vttablet/tabletserver/tabletserver.go
@@ -265,7 +265,7 @@ func NewTabletServerWithNilTopoServer(config tabletenv.TabletConfig) *TabletServ
func NewTabletServer(config tabletenv.TabletConfig, topoServer *topo.Server, alias topodatapb.TabletAlias) *TabletServer {
tsv := &TabletServer{
QueryTimeout: sync2.NewAtomicDuration(time.Duration(config.QueryTimeout * 1e9)),
- BeginTimeout: sync2.NewAtomicDuration(time.Duration(config.TxPoolTimeout * 1e9)),
+ BeginTimeout: sync2.NewAtomicDuration(time.Duration(config.QueryTimeout * 1e9)),
TerseErrors: config.TerseErrors,
enableHotRowProtection: config.EnableHotRowProtection || config.EnableHotRowProtectionDryRun,
checkMySQLThrottler: sync2.NewSemaphore(1, 0),
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment