Skip to content

Commit ed3dbdf

Browse files
[release-20.0] Atomic Copy: Handle error that was ignored while streaming tables and log it (vitessio#18313) (vitessio#18314)
Signed-off-by: Rohit Nayak <[email protected]> Signed-off-by: Manan Gupta <[email protected]> Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com> Co-authored-by: Manan Gupta <[email protected]>
1 parent 83e05b5 commit ed3dbdf

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

go/vt/vttablet/tabletserver/vstreamer/tablestreamer.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,8 @@ func (ts *tableStreamer) Stream() error {
116116
if _, err := conn.ExecuteFetch(fmt.Sprintf("set @@session.net_write_timeout = %v", vttablet.VReplicationNetWriteTimeout), 1, false); err != nil {
117117
return err
118118
}
119+
log.Infof("TableStreamer Stream() started with net read_timeout: %v, net write_timeout: %v",
120+
vttablet.VReplicationNetReadTimeout, vttablet.VReplicationNetWriteTimeout)
119121

120122
rs, err := conn.ExecuteFetch("show full tables", -1, true)
121123
if err != nil {
@@ -137,6 +139,7 @@ func (ts *tableStreamer) Stream() error {
137139
for _, tableName := range ts.tables {
138140
log.Infof("Streaming table %s", tableName)
139141
if err := ts.streamTable(ts.ctx, tableName); err != nil {
142+
log.Errorf("Streaming table %s failed: %v", tableName, err)
140143
return err
141144
}
142145
log.Infof("Finished streaming table %s", tableName)
@@ -194,7 +197,8 @@ func (ts *tableStreamer) streamTable(ctx context.Context, tableName string) erro
194197
}
195198
defer cancel()
196199

197-
if rs.Stream() != nil {
200+
err = rs.Stream()
201+
if err != nil {
198202
return err
199203
}
200204
rs.vse.tableStreamerNumTables.Add(int64(1))

0 commit comments

Comments
 (0)