use defer cancel

pingcap · Mar 2, 2023 · 55f4ea1 · 55f4ea1
1 parent a3c3229
commit 55f4ea1
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/cdc/sink/dmlsink/txn/mysql/mysql.go b/cdc/sink/dmlsink/txn/mysql/mysql.go
@@ -585,7 +585,8 @@ func (s *mysqlBackend) multiStmtExecute(
 		}
 		multiStmtArgs = append(multiStmtArgs, dmls.values[i]...)
 	}
-	ctx, cancelFunc := context.WithTimeout(ctx, writeTimeout)
+	ctx, cancel := context.WithTimeout(ctx, writeTimeout)
+	defer cancel()
 	_, execError := tx.ExecContext(ctx, multiStmtSQL, multiStmtArgs...)
 	if execError != nil {
 		err := logDMLTxnErr(
@@ -596,10 +597,8 @@ func (s *mysqlBackend) multiStmtExecute(
 				log.Warn("failed to rollback txn", zap.Error(rbErr))
 			}
 		}
-		cancelFunc()
 		return err
 	}
-	cancelFunc()
 	return nil
 }