Merge pull request #2898 from murgatroid99/grpc-js-xds_memory_leak_ba…

…ckport_1.12.x grpc-js-xds: fix LrsCallState statsTimer memory leak
grpc · Feb 4, 2025 · 656ca0c · 656ca0c
2 parents 6bd791d + f1f2b2d
commit 656ca0c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/packages/grpc-js-xds/package.json b/packages/grpc-js-xds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@grpc/grpc-js-xds",
-  "version": "1.12.1",
+  "version": "1.12.2",
   "description": "Plugin for @grpc/grpc-js. Adds the xds:// URL scheme and associated features.",
   "main": "build/src/index.js",
   "scripts": {

diff --git a/packages/grpc-js-xds/src/xds-client.ts b/packages/grpc-js-xds/src/xds-client.ts
@@ -682,6 +682,14 @@ class LrsCallState {
     this.sendStats();
   }
 
+  destroy() {
+    if (this.statsTimer) {
+      clearInterval(this.statsTimer);
+      this.statsTimer = null;
+    }
+    return null;
+  }
+
   private handleStreamStatus(status: StatusObject) {
     this.client.trace(
       'LRS stream ended. code=' + status.code + ' details= ' + status.details
@@ -932,7 +940,7 @@ class XdsSingleServerClient {
   }
 
   handleLrsStreamEnd() {
-    this.lrsCallState = null;
+    this.lrsCallState = this.lrsCallState ? this.lrsCallState.destroy() : null;
     /* The backoff timer would start the stream when it finishes. If it is not
      * running, restart the stream immediately. */
     if (!this.lrsBackoff.isRunning()) {