tchannel 3.6.18 → 3.6.19

package/channel.js

@@ -122,7 +122,8 @@ function TChannel(options) {
     this.emitConnectionMetrics =
         typeof this.options.emitConnectionMetrics === 'boolean' ?
         this.options.emitConnectionMetrics : false;
-    this.choosePeerWithHeap = this.options.choosePeerWithHeap || false;
+    this.choosePeerWithHeap = typeof this.options.choosePeerWithHeap === 'boolean' ?
+        this.options.choosePeerWithHeap : true;
 
     this.setObservePeerScoreEvents(this.options.observePeerScoreEvents);
 

package/lazy_relay.js

@@ -679,6 +679,11 @@ LazyRelayOutReq.prototype.emitError =
 function emitError(err) {
     var self = this;
 
+    // ObjectPool weird free() issue; bail early
+    if (!self.channel) {
+        return;
+    }
+
     var now = self.channel.timers.now();
     var elapsed = now - self.start;
 
@@ -718,7 +723,9 @@ function emitError(err) {
     // handleFrameLazily has completed.
     process.nextTick(deferInReqOnError);
     function deferInReqOnError() {
-        self.inreq.onError(err);
+        if (self.inreq) {
+            self.inreq.onError(err);
+        }
     }
 };
 
@@ -733,6 +740,11 @@ LazyRelayOutReq.prototype.onTimeout =
 function onTimeout(now) {
     var self = this;
 
+    // ObjectPool weird free() issue; bail early
+    if (!self.conn) {
+        return;
+    }
+
     self.conn.ops.checkLastTimeoutTime(now);
     self.conn.ops.popOutReq(self.id, self.extendLogInfo({
         info: 'lazy out request timed out',
@@ -756,6 +768,11 @@ function handleFrameLazily(frame) {
     // - v2.Types.ErrorResponse
     var self = this;
 
+    // ObjectPool weird free() issue; bail early
+    if (!self.inreq) {
+        return;
+    }
+
     frame.setId(self.inreq.id);
     self.inreq.conn.writeToSocket(frame.buffer);
     if (frame.bodyRW.lazy.isFrameTerminal(frame)) {

package/package.json

@@ -2,7 +2,7 @@
   "name": "tchannel",
   "description": "network multiplexing and framing protocol for RPC or parser drag racing",
   "author": "mranney@uber.com",
-  "version": "3.6.18",
+  "version": "3.6.19",
   "scripts": {
     "lint": "eslint $(git ls-files | grep '.js$')",
     "travis": "npm run test",
@@ -43,7 +43,7 @@
     "safe-json-parse": "^4.0.0",
     "sse4_crc32": "4.1.1",
     "tape-cluster": "2.1.0",
-    "thriftrw": "^3.3.0",
+    "thriftrw": "^3.4.0",
     "xorshift": "^0.2.0",
     "xtend": "^4.0.0"
   },

package/peer.js

@@ -431,6 +431,7 @@ function waitForIdentified(conn, callback) {
 TChannelPeer.prototype._waitForIdentified =
 function _waitForIdentified(conn, callback) {
     var self = this;
+    var called = false;
 
     // Setup an ident descriptor so we can stop waiting for identified later
     var slot = self.getIdentDescriptorSlot();
@@ -464,6 +465,12 @@ function _waitForIdentified(conn, callback) {
     }
 
     function finish(err) {
+        // Multiple events can trigger which causes double callback hilarity.
+        if (called) {
+            return;
+        }
+        called = true;
+
         self.stopWaitingForIdentified(slot);
         callback(err);
     }