grpc
/
grpc-node
mirror of https://github.com/grpc/grpc-node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2808 from murgatroid99/grpc-js_transport_error_reporting 

grpc-js: Report session error events instead of waiting for close
This commit is contained in:
Michael Lumish 2024-09-04 17:56:24 -07:00 committed by GitHub
parent f5ea6ce271 d409311bf2
commit c63bdae8da
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/grpc-js/src/transport.ts
View File

@ -223,9 +223,8 @@ class Http2Transport implements Transport {
); );
session.once('error', error => { session.once('error', error => {
/* Do nothing here. Any error should also trigger a close event, which is
* where we want to handle that. */
this.trace('connection closed with error ' + (error as Error).message); this.trace('connection closed with error ' + (error as Error).message);
this.handleDisconnect();
}); });
if (logging.isTracerEnabled(TRACER_NAME)) { if (logging.isTracerEnabled(TRACER_NAME)) {
@ -383,6 +382,9 @@ class Http2Transport implements Transport {
* Handle connection drops, but not GOAWAYs. * Handle connection drops, but not GOAWAYs.
*/ */
private handleDisconnect() { private handleDisconnect() {
if (this.disconnectHandled) {
return;
}
this.clearKeepaliveTimeout(); this.clearKeepaliveTimeout();
this.reportDisconnectToOwner(false); this.reportDisconnectToOwner(false);
/* Give calls an event loop cycle to finish naturally before reporting the /* Give calls an event loop cycle to finish naturally before reporting the
@ -768,6 +770,7 @@ export class Http2SubchannelConnector implements SubchannelConnector {
); );
this.session = session; this.session = session;
let errorMessage = 'Failed to connect'; let errorMessage = 'Failed to connect';
let reportedError = false;
session.unref(); session.unref();
session.once('connect', () => { session.once('connect', () => {
session.removeAllListeners(); session.removeAllListeners();
@ -778,12 +781,19 @@ export class Http2SubchannelConnector implements SubchannelConnector {
this.session = null; this.session = null;
// Leave time for error event to happen before rejecting // Leave time for error event to happen before rejecting
setImmediate(() => { setImmediate(() => {
reject(`${errorMessage} (${new Date().toISOString()})`); if (!reportedError) {
reportedError = true;
reject(`${errorMessage} (${new Date().toISOString()})`);
}
}); });
}); });
session.once('error', error => { session.once('error', error => {
errorMessage = (error as Error).message; errorMessage = (error as Error).message;
this.trace('connection failed with error ' + errorMessage); this.trace('connection failed with error ' + errorMessage);
if (!reportedError) {
reportedError = true;
reject(`${errorMessage} (${new Date().toISOString()})`);
}
}); });
}); });
} }