updating to be spec compliant

daprahamian · mbroadst · commit 764cdec1fd24 · 2019-02-27T12:41:53.000-05:00
diff --git a/lib/sessions.js b/lib/sessions.js
@@ -452,6 +452,9 @@ function endTransaction(session, commandName, callback) {
 
         if (isUnknownTransactionCommitResult(e)) {
           e.errorLabels.push('UnknownTransactionCommitResult');
+
+          // Per Mongos Pinning, must unpin session
+          session.transaction.unpinServer();
         }
       }
     } else {
diff --git a/lib/topologies/mongos.js b/lib/topologies/mongos.js
@@ -507,7 +507,7 @@ function pickProxy(self, session) {
     self.index = (self.index + 1) % connectedProxies.length;
   }
 
-  if (transaction) {
+  if (transaction && transaction.isActive) {
     transaction.pinServer(proxy);
   }
 
diff --git a/lib/transactions.js b/lib/transactions.js
@@ -129,7 +129,7 @@ class Transaction {
     const nextStates = stateMachine[this.state];
     if (nextStates && nextStates.indexOf(nextState) !== -1) {
       this.state = nextState;
-      if (this.state === TxnState.NO_TRANSACTION) {
+      if (this.state === TxnState.NO_TRANSACTION || this.state === TxnState.STARTING_TRANSACTION) {
         this.unpinServer();
       }
       return;
diff --git a/lib/wireprotocol/command.js b/lib/wireprotocol/command.js
@@ -60,10 +60,24 @@ function command(server, ns, cmd, options, callback) {
     ? new Msg(bson, cmdNs, finalCmd, commandOptions)
     : new Query(bson, cmdNs, finalCmd, commandOptions);
 
+  const commandResponseHandler = function(err) {
+    if (
+      options.session &&
+      options.session.transaction &&
+      err &&
+      err instanceof MongoError &&
+      err.hasErrorLabel('TransientTransactionError')
+    ) {
+      options.session.transaction.unpinServer();
+    }
+
+    return callback.apply(null, arguments);
+  };
+
   try {
-    pool.write(message, commandOptions, callback);
+    pool.write(message, commandOptions, commandResponseHandler);
   } catch (err) {
-    callback(err);
+    callback(commandResponseHandler);
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -452,6 +452,9 @@ function endTransaction(session, commandName, callback) {`
`452`	`452`
`453`	`453`	`if (isUnknownTransactionCommitResult(e)) {`
`454`	`454`	`e.errorLabels.push('UnknownTransactionCommitResult');`
	`455`	`+`
	`456`	`+ // Per Mongos Pinning, must unpin session`
	`457`	`+ session.transaction.unpinServer();`
`455`	`458`	`}`
`456`	`459`	`}`
`457`	`460`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -507,7 +507,7 @@ function pickProxy(self, session) {`
`507`	`507`	`self.index = (self.index + 1) % connectedProxies.length;`
`508`	`508`	`}`
`509`	`509`
`510`		`- if (transaction) {`
	`510`	`+ if (transaction && transaction.isActive) {`
`511`	`511`	`transaction.pinServer(proxy);`
`512`	`512`	`}`
`513`	`513`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ class Transaction {`
`129`	`129`	`const nextStates = stateMachine[this.state];`
`130`	`130`	`if (nextStates && nextStates.indexOf(nextState) !== -1) {`
`131`	`131`	`this.state = nextState;`
`132`		`- if (this.state === TxnState.NO_TRANSACTION) {`
	`132`	`+ if (this.state === TxnState.NO_TRANSACTION \|\| this.state === TxnState.STARTING_TRANSACTION) {`
`133`	`133`	`this.unpinServer();`
`134`	`134`	`}`
`135`	`135`	`return;`