heartbeatWriter: wrap error with more info (#18538)

shlomi-noach · web-flow · commit c8d71bcdf7c7 · 2025-08-21T16:22:15.000Z
Signed-off-by: Shlomi Noach &lt;2607934+shlomi-noach@users.noreply.github.com&gt;
diff --git a/go/vt/vttablet/tabletserver/repltracker/writer.go b/go/vt/vttablet/tabletserver/repltracker/writer.go
@@ -32,6 +32,7 @@ import (
 	"vitess.io/vitess/go/vt/logutil"
 	"vitess.io/vitess/go/vt/mysqlctl"
 	"vitess.io/vitess/go/vt/sqlparser"
+	"vitess.io/vitess/go/vt/vterrors"
 	"vitess.io/vitess/go/vt/vttablet/tabletserver/tabletenv"
 
 	querypb "vitess.io/vitess/go/vt/proto/query"
@@ -257,14 +258,14 @@ func (w *heartbeatWriter) write() error {
 	}
 	appConn, err := w.appPool.Get(ctx)
 	if err != nil {
-		return err
+		return vterrors.Wrapf(err, "heartbeatWriter failed to get app connection from pool %v", w.appPool.Name)
 	}
 	defer appConn.Recycle()
 	w.writeConnID.Store(appConn.Conn.ID())
 	defer w.writeConnID.Store(-1)
 	_, err = appConn.Conn.ExecuteFetch(upsert, 1, false)
 	if err != nil {
-		return err
+		return vterrors.Wrapf(err, "heartbeatWriter failed to execute fetch on app connection %v", appConn.Conn.ID())
 	}
 	return nil
 }

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ import (`
`32`	`32`	`"vitess.io/vitess/go/vt/logutil"`
`33`	`33`	`"vitess.io/vitess/go/vt/mysqlctl"`
`34`	`34`	`"vitess.io/vitess/go/vt/sqlparser"`
	`35`	`+ "vitess.io/vitess/go/vt/vterrors"`
`35`	`36`	`"vitess.io/vitess/go/vt/vttablet/tabletserver/tabletenv"`
`36`	`37`
`37`	`38`	`querypb "vitess.io/vitess/go/vt/proto/query"`
`@@ -257,14 +258,14 @@ func (w *heartbeatWriter) write() error {`
`257`	`258`	`}`
`258`	`259`	`appConn, err := w.appPool.Get(ctx)`
`259`	`260`	`if err != nil {`
`260`		`- return err`
	`261`	`+ return vterrors.Wrapf(err, "heartbeatWriter failed to get app connection from pool %v", w.appPool.Name)`
`261`	`262`	`}`
`262`	`263`	`defer appConn.Recycle()`
`263`	`264`	`w.writeConnID.Store(appConn.Conn.ID())`
`264`	`265`	`defer w.writeConnID.Store(-1)`
`265`	`266`	`_, err = appConn.Conn.ExecuteFetch(upsert, 1, false)`
`266`	`267`	`if err != nil {`
`267`		`- return err`
	`268`	`+ return vterrors.Wrapf(err, "heartbeatWriter failed to execute fetch on app connection %v", appConn.Conn.ID())`
`268`	`269`	`}`
`269`	`270`	`return nil`
`270`	`271`	`}`