Cleanup JSON response from fetchers

G-Research · Dec 5, 2023 · 7a7ac6c · 7a7ac6c
1 parent d466971
commit 7a7ac6c
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/core/trino-main/src/main/java/io/trino/server/remotetask/ContinuousTaskStatusFetcher.java b/core/trino-main/src/main/java/io/trino/server/remotetask/ContinuousTaskStatusFetcher.java
@@ -178,6 +178,7 @@ public void success(TaskStatus value)
                     errorTracker.requestSucceeded();
                 }
                 finally {
+                    cleanupRequest();
                     scheduleNextRequest();
                 }
             }
@@ -203,6 +204,7 @@ public void failed(Throwable cause)
                     onFail.accept(e);
                 }
                 finally {
+                    cleanupRequest();
                     scheduleNextRequest();
                 }
             }
@@ -218,6 +220,14 @@ public void fatal(Throwable cause)
         }
     }
 
+    private synchronized void cleanupRequest()
+    {
+        if (future != null && future.isDone()) {
+            // remove outstanding reference to JSON response
+            future = null;
+        }
+    }
+
     void updateTaskStatus(TaskStatus newValue)
     {
         // change to new value if old value is not changed and new value has a newer version

diff --git a/core/trino-main/src/main/java/io/trino/server/remotetask/DynamicFiltersFetcher.java b/core/trino-main/src/main/java/io/trino/server/remotetask/DynamicFiltersFetcher.java
@@ -169,6 +169,7 @@ public void success(VersionedDynamicFilterDomains newDynamicFilterDomains)
                     errorTracker.requestSucceeded();
                 }
                 finally {
+                    cleanupRequest();
                     fetchDynamicFiltersIfNecessary();
                 }
             }
@@ -190,6 +191,7 @@ public void failed(Throwable cause)
                     onFail.accept(e);
                 }
                 finally {
+                    cleanupRequest();
                     fetchDynamicFiltersIfNecessary();
                 }
             }
@@ -205,6 +207,14 @@ public void fatal(Throwable cause)
         }
     }
 
+    private synchronized void cleanupRequest()
+    {
+        if (future != null && future.isDone()) {
+            // remove outstanding reference to JSON response
+            future = null;
+        }
+    }
+
     private void updateDynamicFilterDomains(VersionedDynamicFilterDomains newDynamicFilterDomains)
     {
         synchronized (this) {