Skip to content

Add RetryableWriteError to write concern error in bulk writes. #1880

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vbabanin wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Add RetryableWriteError to write concern error in bulk writes. #1880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4ff4374
Add RetryableWriteError to write concern error in bulk writes.
vbabanin Feb 3, 2026
4b97a8f
Remove unused imports.
vbabanin Feb 4, 2026
f530971
Merge branch 'main' into JAVA-6087
vbabanin Feb 4, 2026
9099b0f
Remove unused import.
vbabanin Feb 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions driver-core/src/main/com/mongodb/internal/operation/CommandOperationHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,10 +237,13 @@ private static boolean decideRetryableAndAddRetryableWriteErrorLabel(final Throw
return exception.hasErrorLabel(RETRYABLE_WRITE_ERROR_LABEL);
}

static boolean shouldAddRetryableWriteErrorLabel(final MongoException exception, final int maxWireVersion) {
return (maxWireVersion >= 9 && exception instanceof MongoSocketException)
|| (maxWireVersion < 9 && isRetryableException(exception));
}

static void addRetryableWriteErrorLabel(final MongoException exception, final int maxWireVersion) {
if (maxWireVersion >= 9 && exception instanceof MongoSocketException) {
exception.addLabel(RETRYABLE_WRITE_ERROR_LABEL);
} else if (maxWireVersion < 9 && isRetryableException(exception)) {
if (shouldAddRetryableWriteErrorLabel(exception, maxWireVersion)) {
exception.addLabel(RETRYABLE_WRITE_ERROR_LABEL);
}
}
Expand Down
25 changes: 16 additions & 9 deletions driver-core/src/main/com/mongodb/internal/operation/MixedBulkWriteOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,20 +51,20 @@
import java.util.List;
import java.util.Locale;
import java.util.Optional;
import java.util.Set;
import java.util.function.Supplier;
import java.util.stream.Collectors;

import static com.mongodb.assertions.Assertions.assertTrue;
import static com.mongodb.assertions.Assertions.isTrueArgument;
import static com.mongodb.assertions.Assertions.notNull;
import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
import static com.mongodb.internal.operation.AsyncOperationHelper.exceptionTransformingCallback;
import static com.mongodb.internal.operation.AsyncOperationHelper.withAsyncSourceAndConnection;
import static com.mongodb.internal.operation.CommandOperationHelper.RETRYABLE_WRITE_ERROR_LABEL;
import static com.mongodb.internal.operation.CommandOperationHelper.addRetryableWriteErrorLabel;
import static com.mongodb.internal.operation.CommandOperationHelper.logRetryExecute;
import static com.mongodb.internal.operation.CommandOperationHelper.loggingShouldAttemptToRetryWriteAndAddRetryableLabel;
import static com.mongodb.internal.operation.CommandOperationHelper.onRetryableWriteAttemptFailure;
import static com.mongodb.internal.operation.CommandOperationHelper.shouldAddRetryableWriteErrorLabel;
import static com.mongodb.internal.operation.CommandOperationHelper.transformWriteException;
import static com.mongodb.internal.operation.CommandOperationHelper.validateAndGetEffectiveWriteConcern;
import static com.mongodb.internal.operation.OperationHelper.LOGGER;
Expand Down Expand Up @@ -287,8 +287,11 @@ private BulkWriteResult executeBulkWriteBatch(
connection.getDescription().getServerAddress(), "errMsg", timeoutContext);
if (writeConcernBasedError != null) {
if (currentBulkWriteTracker.lastAttempt()) {
addRetryableWriteErrorLabel(writeConcernBasedError, maxWireVersion);
addErrorLabelsToWriteConcern(result.getDocument("writeConcernError"), writeConcernBasedError.getErrorLabels());
// The raw result is not exposed to the user, so labels can be added directly here.
// They are further processed as if they originated from the server.
if (shouldAddRetryableWriteErrorLabel(writeConcernBasedError, maxWireVersion)) {
addRetryableErrorLabelToResult(result);
}
} else if (loggingShouldAttemptToRetryWriteAndAddRetryableLabel(retryState, writeConcernBasedError)) {
throw new MongoWriteConcernWithResponseException(writeConcernBasedError, result);
}
Expand Down Expand Up @@ -341,9 +344,11 @@ private void executeBulkWriteBatchAsync(
connection.getDescription().getServerAddress(), "errMsg", operationContext.getTimeoutContext());
if (writeConcernBasedError != null) {
if (currentBulkWriteTracker.lastAttempt()) {
addRetryableWriteErrorLabel(writeConcernBasedError, maxWireVersion);
addErrorLabelsToWriteConcern(result.getDocument("writeConcernError"),
writeConcernBasedError.getErrorLabels());
// The raw result is not exposed to the user, so labels can be added directly here.
// They are further processed as if they originated from the server.
if (shouldAddRetryableWriteErrorLabel(writeConcernBasedError, maxWireVersion)) {
addRetryableErrorLabelToResult(result);
}
} else if (loggingShouldAttemptToRetryWriteAndAddRetryableLabel(retryState, writeConcernBasedError)) {
iterationCallback.onResult(null,
new MongoWriteConcernWithResponseException(writeConcernBasedError, result));
Expand Down Expand Up @@ -456,9 +461,11 @@ private boolean shouldExpectResponse(final BulkWriteBatch batch, final WriteConc
return effectiveWriteConcern.isAcknowledged() || (ordered && batch.hasAnotherBatch());
}

private void addErrorLabelsToWriteConcern(final BsonDocument result, final Set<String> errorLabels) {
private void addRetryableErrorLabelToResult(final BsonDocument result) {
if (!result.containsKey("errorLabels")) {
result.put("errorLabels", new BsonArray(errorLabels.stream().map(BsonString::new).collect(Collectors.toList())));
BsonArray labelsArray = new BsonArray();
labelsArray.add(new BsonString(RETRYABLE_WRITE_ERROR_LABEL));
result.put("errorLabels", labelsArray);
}
}

Expand Down
5 changes: 0 additions & 5 deletions driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTestModifications.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import java.util.function.Function;
import java.util.function.Supplier;

import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet;
import static com.mongodb.ClusterFixture.isSharded;
import static com.mongodb.ClusterFixture.serverVersionLessThan;
import static com.mongodb.assertions.Assertions.assertNotNull;
Expand Down Expand Up @@ -400,10 +399,6 @@ public static void applyCustomizations(final TestDef def) {
.test("retryable-writes", "retryable-writes insertOne serverErrors", "InsertOne succeeds after retryable writeConcernError")
.test("retryable-writes", "retryable-writes bulkWrite serverErrors",
"BulkWrite succeeds after retryable writeConcernError in first batch");
def.skipJira("https://jira.mongodb.org/browse/JAVA-5341")
.when(() -> isDiscoverableReplicaSet() && serverVersionLessThan(4, 4))
.test("retryable-writes", "retryable-writes insertOne serverErrors",
"RetryableWriteError label is added based on writeConcernError in pre-4.4 mongod response");

// server-discovery-and-monitoring (SDAM)

Expand Down