Skip to content

Commit

Permalink
fix: only consider MongoError subclasses for retryability
Browse files Browse the repository at this point in the history
A change to use the `RetryableWriteError` label to determine if
a write should be retried ignored that non-MongoError's could also
be caught. These should be ignored for the purposes of retryability
  • Loading branch information
mbroadst committed Feb 5, 2020
1 parent fefc165 commit 265fe40
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
3 changes: 2 additions & 1 deletion lib/core/sdam/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ const isSDAMUnrecoverableError = require('../error').isSDAMUnrecoverableError;
const isNetworkTimeoutError = require('../error').isNetworkTimeoutError;
const isRetryableWriteError = require('../error').isRetryableWriteError;
const makeStateMachine = require('../utils').makeStateMachine;
const maxWireVersion = require('../utils').maxWireVersion;
const common = require('./common');
const ServerType = common.ServerType;

Expand Down Expand Up @@ -468,7 +469,7 @@ function makeOperationHandler(server, options, callback) {
}
} else {
// if pre-4.4 server, then add error label if its a retryable write error
if (server.description.maxWireVersion < 9 && isRetryableWriteError(err)) {
if (maxWireVersion(server) < 9 && isRetryableWriteError(err)) {
err.addErrorLabel('RetryableWriteError');
}

Expand Down
9 changes: 6 additions & 3 deletions lib/core/sdam/topology.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ const CoreCursor = require('../cursor').CoreCursor;
const deprecate = require('util').deprecate;
const BSON = require('../connection/utils').retrieveBSON();
const createCompressionInfo = require('../topologies/shared').createCompressionInfo;
const isRetryableError = require('../error').isRetryableError;
const isNodeShuttingDownError = require('../error').isNodeShuttingDownError;
const maxWireVersion = require('../utils').maxWireVersion;
const ClientSession = require('../sessions').ClientSession;
Expand Down Expand Up @@ -680,7 +679,7 @@ class Topology extends EventEmitter {

const cb = (err, result) => {
if (!err) return callback(null, result);
if (!err.hasErrorLabel('RetryableWriteError')) {
if (!shouldRetryOperation(err)) {
return callback(err);
}

Expand Down Expand Up @@ -944,7 +943,7 @@ function executeWriteOperation(args, options, callback) {

const handler = (err, result) => {
if (!err) return callback(null, result);
if (!err.hasErrorLabel('RetryableWriteError')) {
if (!shouldRetryOperation(err)) {
err = getMMAPError(err);
return callback(err);
}
Expand Down Expand Up @@ -972,6 +971,10 @@ function executeWriteOperation(args, options, callback) {
});
}

function shouldRetryOperation(err) {
return err instanceof MongoError && err.hasErrorLabel('RetryableWriteError');
}

/**
* Resets the internal state of this server to `Unknown` by simulating an empty ismaster
*
Expand Down

0 comments on commit 265fe40

Please sign in to comment.