Ensure proper batches are retried properly

skriptble · skriptble · commit a7eb0f4da509 · 2019-03-13T12:11:43.000-04:00
GODRIVER-871 Change-Id: I7608168346b7bbfe5a8d3620c9a500178d6628ee
diff --git a/x/mongo/driver/bulk_write.go b/x/mongo/driver/bulk_write.go
@@ -233,20 +233,20 @@ func runInsert(
 		if cmd.Session != nil {
 			cmd.Session.RetryWrite = false
 		}
-		return insert(ctx, cmd, ss, nil)
+		return insert(ctx, &cmd, ss, nil)
 	}
 
 	cmd.Session.RetryWrite = retryWrite
 	cmd.Session.IncrementTxnNumber()
 
-	res, origErr := insert(ctx, cmd, ss, nil)
+	res, origErr := insert(ctx, &cmd, ss, nil)
 	if shouldRetry(origErr, res.WriteConcernError) {
 		newServer, err := topo.SelectServer(ctx, selector)
 		if err != nil || !retrySupported(topo, ss.Description(), cmd.Session, cmd.WriteConcern) {
 			return res, origErr
 		}
 
-		return insert(ctx, cmd, newServer, origErr)
+		return insert(ctx, &cmd, newServer, origErr)
 	}
 
 	return res, origErr
@@ -300,20 +300,20 @@ func runDelete(
 		if cmd.Session != nil {
 			cmd.Session.RetryWrite = false
 		}
-		return delete(ctx, cmd, ss, nil)
+		return delete(ctx, &cmd, ss, nil)
 	}
 
 	cmd.Session.RetryWrite = retryWrite
 	cmd.Session.IncrementTxnNumber()
 
-	res, origErr := delete(ctx, cmd, ss, nil)
+	res, origErr := delete(ctx, &cmd, ss, nil)
 	if shouldRetry(origErr, res.WriteConcernError) {
 		newServer, err := topo.SelectServer(ctx, selector)
 		if err != nil || !retrySupported(topo, ss.Description(), cmd.Session, cmd.WriteConcern) {
 			return res, origErr
 		}
 
-		return delete(ctx, cmd, newServer, origErr)
+		return delete(ctx, &cmd, newServer, origErr)
 	}
 
 	return res, origErr
@@ -376,20 +376,20 @@ func runUpdate(
 		if cmd.Session != nil {
 			cmd.Session.RetryWrite = false
 		}
-		return update(ctx, cmd, ss, nil)
+		return update(ctx, &cmd, ss, nil)
 	}
 
 	cmd.Session.RetryWrite = retryWrite
 	cmd.Session.IncrementTxnNumber()
 
-	res, origErr := update(ctx, cmd, ss, nil)
+	res, origErr := update(ctx, &cmd, ss, nil)
 	if shouldRetry(origErr, res.WriteConcernError) {
 		newServer, err := topo.SelectServer(ctx, selector)
 		if err != nil || !retrySupported(topo, ss.Description(), cmd.Session, cmd.WriteConcern) {
 			return res, origErr
 		}
 
-		return update(ctx, cmd, newServer, origErr)
+		return update(ctx, &cmd, newServer, origErr)
 	}
 
 	return res, origErr
diff --git a/x/mongo/driver/delete.go b/x/mongo/driver/delete.go
@@ -65,13 +65,13 @@ func Delete(
 		if cmd.Session != nil {
 			cmd.Session.RetryWrite = false // explicitly set to false to prevent encoding transaction number
 		}
-		return delete(ctx, cmd, ss, nil)
+		return delete(ctx, &cmd, ss, nil)
 	}
 
 	cmd.Session.RetryWrite = retryWrite
 	cmd.Session.IncrementTxnNumber()
 
-	res, originalErr := delete(ctx, cmd, ss, nil)
+	res, originalErr := delete(ctx, &cmd, ss, nil)
 
 	// Retry if appropriate
 	if cerr, ok := originalErr.(command.Error); (ok && cerr.Retryable()) ||
@@ -83,14 +83,14 @@ func Delete(
 			return res, originalErr
 		}
 
-		return delete(ctx, cmd, ss, cerr)
+		return delete(ctx, &cmd, ss, cerr)
 	}
 	return res, originalErr
 }
 
 func delete(
 	ctx context.Context,
-	cmd command.Delete,
+	cmd *command.Delete,
 	ss *topology.SelectedServer,
 	oldErr error,
 ) (result.Delete, error) {
diff --git a/x/mongo/driver/insert.go b/x/mongo/driver/insert.go
@@ -62,14 +62,14 @@ func Insert(
 		if cmd.Session != nil {
 			cmd.Session.RetryWrite = false // explicitly set to false to prevent encoding transaction number
 		}
-		return insert(ctx, cmd, ss, nil)
+		return insert(ctx, &cmd, ss, nil)
 	}
 
 	// TODO figure out best place to put retry write.  Command shouldn't have to know about this field.
 	cmd.Session.RetryWrite = retryWrite
 	cmd.Session.IncrementTxnNumber()
 
-	res, originalErr := insert(ctx, cmd, ss, nil)
+	res, originalErr := insert(ctx, &cmd, ss, nil)
 
 	// Retry if appropriate
 	if cerr, ok := originalErr.(command.Error); (ok && cerr.Retryable()) ||
@@ -81,15 +81,15 @@ func Insert(
 			return res, originalErr
 		}
 
-		return insert(ctx, cmd, ss, cerr)
+		return insert(ctx, &cmd, ss, cerr)
 	}
 
 	return res, originalErr
 }
 
 func insert(
 	ctx context.Context,
-	cmd command.Insert,
+	cmd *command.Insert,
 	ss *topology.SelectedServer,
 	oldErr error,
 ) (result.Insert, error) {
diff --git a/x/mongo/driver/update.go b/x/mongo/driver/update.go
@@ -90,13 +90,13 @@ func Update(
 		if cmd.Session != nil {
 			cmd.Session.RetryWrite = false // explicitly set to false to prevent encoding transaction number
 		}
-		return update(ctx, cmd, ss, nil)
+		return update(ctx, &cmd, ss, nil)
 	}
 
 	cmd.Session.RetryWrite = retryWrite
 	cmd.Session.IncrementTxnNumber()
 
-	res, originalErr := update(ctx, cmd, ss, nil)
+	res, originalErr := update(ctx, &cmd, ss, nil)
 
 	// Retry if appropriate
 	if cerr, ok := originalErr.(command.Error); (ok && cerr.Retryable()) ||
@@ -108,15 +108,15 @@ func Update(
 			return res, originalErr
 		}
 
-		return update(ctx, cmd, ss, cerr)
+		return update(ctx, &cmd, ss, cerr)
 	}
 	return res, originalErr
 
 }
 
 func update(
 	ctx context.Context,
-	cmd command.Update,
+	cmd *command.Update,
 	ss *topology.SelectedServer,
 	oldErr error,
 ) (result.Update, error) {

Original file line number	Diff line number	Diff line change
`@@ -233,20 +233,20 @@ func runInsert(`
`233`	`233`	`if cmd.Session != nil {`
`234`	`234`	`cmd.Session.RetryWrite = false`
`235`	`235`	`}`
`236`		`- return insert(ctx, cmd, ss, nil)`
	`236`	`+ return insert(ctx, &cmd, ss, nil)`
`237`	`237`	`}`
`238`	`238`
`239`	`239`	`cmd.Session.RetryWrite = retryWrite`
`240`	`240`	`cmd.Session.IncrementTxnNumber()`
`241`	`241`
`242`		`- res, origErr := insert(ctx, cmd, ss, nil)`
	`242`	`+ res, origErr := insert(ctx, &cmd, ss, nil)`
`243`	`243`	`if shouldRetry(origErr, res.WriteConcernError) {`
`244`	`244`	`newServer, err := topo.SelectServer(ctx, selector)`
`245`	`245`	`if err != nil \|\| !retrySupported(topo, ss.Description(), cmd.Session, cmd.WriteConcern) {`
`246`	`246`	`return res, origErr`
`247`	`247`	`}`
`248`	`248`
`249`		`- return insert(ctx, cmd, newServer, origErr)`
	`249`	`+ return insert(ctx, &cmd, newServer, origErr)`
`250`	`250`	`}`
`251`	`251`
`252`	`252`	`return res, origErr`
`@@ -300,20 +300,20 @@ func runDelete(`
`300`	`300`	`if cmd.Session != nil {`
`301`	`301`	`cmd.Session.RetryWrite = false`
`302`	`302`	`}`
`303`		`- return delete(ctx, cmd, ss, nil)`
	`303`	`+ return delete(ctx, &cmd, ss, nil)`
`304`	`304`	`}`
`305`	`305`
`306`	`306`	`cmd.Session.RetryWrite = retryWrite`
`307`	`307`	`cmd.Session.IncrementTxnNumber()`
`308`	`308`
`309`		`- res, origErr := delete(ctx, cmd, ss, nil)`
	`309`	`+ res, origErr := delete(ctx, &cmd, ss, nil)`
`310`	`310`	`if shouldRetry(origErr, res.WriteConcernError) {`
`311`	`311`	`newServer, err := topo.SelectServer(ctx, selector)`
`312`	`312`	`if err != nil \|\| !retrySupported(topo, ss.Description(), cmd.Session, cmd.WriteConcern) {`
`313`	`313`	`return res, origErr`
`314`	`314`	`}`
`315`	`315`
`316`		`- return delete(ctx, cmd, newServer, origErr)`
	`316`	`+ return delete(ctx, &cmd, newServer, origErr)`
`317`	`317`	`}`
`318`	`318`
`319`	`319`	`return res, origErr`
`@@ -376,20 +376,20 @@ func runUpdate(`
`376`	`376`	`if cmd.Session != nil {`
`377`	`377`	`cmd.Session.RetryWrite = false`
`378`	`378`	`}`
`379`		`- return update(ctx, cmd, ss, nil)`
	`379`	`+ return update(ctx, &cmd, ss, nil)`
`380`	`380`	`}`
`381`	`381`
`382`	`382`	`cmd.Session.RetryWrite = retryWrite`
`383`	`383`	`cmd.Session.IncrementTxnNumber()`
`384`	`384`
`385`		`- res, origErr := update(ctx, cmd, ss, nil)`
	`385`	`+ res, origErr := update(ctx, &cmd, ss, nil)`
`386`	`386`	`if shouldRetry(origErr, res.WriteConcernError) {`
`387`	`387`	`newServer, err := topo.SelectServer(ctx, selector)`
`388`	`388`	`if err != nil \|\| !retrySupported(topo, ss.Description(), cmd.Session, cmd.WriteConcern) {`
`389`	`389`	`return res, origErr`
`390`	`390`	`}`
`391`	`391`
`392`		`- return update(ctx, cmd, newServer, origErr)`
	`392`	`+ return update(ctx, &cmd, newServer, origErr)`
`393`	`393`	`}`
`394`	`394`
`395`	`395`	`return res, origErr`
Original file line number	Diff line number	Diff line change
`@@ -65,13 +65,13 @@ func Delete(`
`65`	`65`	`if cmd.Session != nil {`
`66`	`66`	`cmd.Session.RetryWrite = false // explicitly set to false to prevent encoding transaction number`
`67`	`67`	`}`
`68`		`- return delete(ctx, cmd, ss, nil)`
	`68`	`+ return delete(ctx, &cmd, ss, nil)`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`cmd.Session.RetryWrite = retryWrite`
`72`	`72`	`cmd.Session.IncrementTxnNumber()`
`73`	`73`
`74`		`- res, originalErr := delete(ctx, cmd, ss, nil)`
	`74`	`+ res, originalErr := delete(ctx, &cmd, ss, nil)`
`75`	`75`
`76`	`76`	`// Retry if appropriate`
`77`	`77`	`if cerr, ok := originalErr.(command.Error); (ok && cerr.Retryable()) \|\|`
`@@ -83,14 +83,14 @@ func Delete(`
`83`	`83`	`return res, originalErr`
`84`	`84`	`}`
`85`	`85`
`86`		`- return delete(ctx, cmd, ss, cerr)`
	`86`	`+ return delete(ctx, &cmd, ss, cerr)`
`87`	`87`	`}`
`88`	`88`	`return res, originalErr`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`func delete(`
`92`	`92`	`ctx context.Context,`
`93`		`- cmd command.Delete,`
	`93`	`+ cmd *command.Delete,`
`94`	`94`	`ss *topology.SelectedServer,`
`95`	`95`	`oldErr error,`
`96`	`96`	`) (result.Delete, error) {`
Original file line number	Diff line number	Diff line change
`@@ -62,14 +62,14 @@ func Insert(`
`62`	`62`	`if cmd.Session != nil {`
`63`	`63`	`cmd.Session.RetryWrite = false // explicitly set to false to prevent encoding transaction number`
`64`	`64`	`}`
`65`		`- return insert(ctx, cmd, ss, nil)`
	`65`	`+ return insert(ctx, &cmd, ss, nil)`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`// TODO figure out best place to put retry write. Command shouldn't have to know about this field.`
`69`	`69`	`cmd.Session.RetryWrite = retryWrite`
`70`	`70`	`cmd.Session.IncrementTxnNumber()`
`71`	`71`
`72`		`- res, originalErr := insert(ctx, cmd, ss, nil)`
	`72`	`+ res, originalErr := insert(ctx, &cmd, ss, nil)`
`73`	`73`
`74`	`74`	`// Retry if appropriate`
`75`	`75`	`if cerr, ok := originalErr.(command.Error); (ok && cerr.Retryable()) \|\|`
`@@ -81,15 +81,15 @@ func Insert(`
`81`	`81`	`return res, originalErr`
`82`	`82`	`}`
`83`	`83`
`84`		`- return insert(ctx, cmd, ss, cerr)`
	`84`	`+ return insert(ctx, &cmd, ss, cerr)`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`return res, originalErr`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`func insert(`
`91`	`91`	`ctx context.Context,`
`92`		`- cmd command.Insert,`
	`92`	`+ cmd *command.Insert,`
`93`	`93`	`ss *topology.SelectedServer,`
`94`	`94`	`oldErr error,`
`95`	`95`	`) (result.Insert, error) {`
Original file line number	Diff line number	Diff line change
`@@ -90,13 +90,13 @@ func Update(`
`90`	`90`	`if cmd.Session != nil {`
`91`	`91`	`cmd.Session.RetryWrite = false // explicitly set to false to prevent encoding transaction number`
`92`	`92`	`}`
`93`		`- return update(ctx, cmd, ss, nil)`
	`93`	`+ return update(ctx, &cmd, ss, nil)`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`cmd.Session.RetryWrite = retryWrite`
`97`	`97`	`cmd.Session.IncrementTxnNumber()`
`98`	`98`
`99`		`- res, originalErr := update(ctx, cmd, ss, nil)`
	`99`	`+ res, originalErr := update(ctx, &cmd, ss, nil)`
`100`	`100`
`101`	`101`	`// Retry if appropriate`
`102`	`102`	`if cerr, ok := originalErr.(command.Error); (ok && cerr.Retryable()) \|\|`
`@@ -108,15 +108,15 @@ func Update(`
`108`	`108`	`return res, originalErr`
`109`	`109`	`}`
`110`	`110`
`111`		`- return update(ctx, cmd, ss, cerr)`
	`111`	`+ return update(ctx, &cmd, ss, cerr)`
`112`	`112`	`}`
`113`	`113`	`return res, originalErr`
`114`	`114`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`func update(`
`118`	`118`	`ctx context.Context,`
`119`		`- cmd command.Update,`
	`119`	`+ cmd *command.Update,`
`120`	`120`	`ss *topology.SelectedServer,`
`121`	`121`	`oldErr error,`
`122`	`122`	`) (result.Update, error) {`