Ensure proper batches are retried properly

GODRIVER-871

Change-Id: I7608168346b7bbfe5a8d3620c9a500178d6628ee

Author: skriptble

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

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) {

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) {

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) {