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 #2790 from murgatroid99/grpc-js_server_idle_test_deflake 

grpc-js: Increase state change deadline in server idle tests
This commit is contained in:
Michael Lumish 2024-07-10 10:26:27 -07:00 committed by GitHub
parent c9342572aa 395de4b333
commit fbbc78d978
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
packages/grpc-js/src/server.ts
View File

@ -1790,19 +1790,22 @@ export class Server {
// for future refreshes
if (
sessionInfo !== undefined &&
sessionInfo.activeStreams === 0 &&
Date.now() - sessionInfo.lastIdle >= ctx.sessionIdleTimeout
sessionInfo.activeStreams === 0
) {
ctx.trace(
'Session idle timeout triggered for ' +
socket?.remoteAddress +
':' +
socket?.remotePort +
' last idle at ' +
sessionInfo.lastIdle
);
if (Date.now() - sessionInfo.lastIdle >= ctx.sessionIdleTimeout) {
ctx.trace(
'Session idle timeout triggered for ' +
socket?.remoteAddress +
':' +
socket?.remotePort +
' last idle at ' +
sessionInfo.lastIdle
);
ctx.closeSession(session);
ctx.closeSession(session);
} else {
sessionInfo.timeout.refresh();
}
}
}

6
packages/grpc-js/test/test-idle-timer.ts
View File

@ -199,7 +199,7 @@ describe('Server idle timer', () => {
grpc.connectivityState.READY
);
client?.waitForClientState(
Date.now() + 600,
Date.now() + 1500,
grpc.connectivityState.IDLE,
done
);
@ -217,7 +217,7 @@ describe('Server idle timer', () => {
);
client!.waitForClientState(
Date.now() + 600,
Date.now() + 1500,
grpc.connectivityState.IDLE,
err => {
if (err) return done(err);
@ -248,7 +248,7 @@ describe('Server idle timer', () => {
);
client!.waitForClientState(
Date.now() + 600,
Date.now() + 1500,
grpc.connectivityState.IDLE,
done
);