Ensure that phantom references are enqueued to reference queue

1 files changed, 6 insertions, 1 deletions

diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/ActiveContainerDeactivationWatchdog.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/ActiveContainerDeactivationWatchdog.java
index 90e2049a868..c6355c93648 100644
--- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/ActiveContainerDeactivationWatchdog.java
+++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/ActiveContainerDeactivationWatchdog.java
@@ -67,7 +67,7 @@ class ActiveContainerDeactivationWatchdog implements ActiveContainerMetrics, Aut
                                            WATCHDOG_FREQUENCY.getSeconds(),
                                            WATCHDOG_FREQUENCY.getSeconds(),
                                            TimeUnit.SECONDS);
-        this.scheduler.scheduleAtFixedRate(System::gc,
+        this.scheduler.scheduleAtFixedRate(ActiveContainerDeactivationWatchdog::triggerGc,
                                            GC_TRIGGER_FREQUENCY.getSeconds(),
                                            GC_TRIGGER_FREQUENCY.getSeconds(),
                                            TimeUnit.SECONDS);
@@ -121,6 +121,11 @@ class ActiveContainerDeactivationWatchdog implements ActiveContainerMetrics, Aut
         }
     }
 
+    private static void triggerGc() {
+        System.gc();
+        System.runFinalization(); // this is required to trigger enqueuing of phantom references on some Linux systems
+    }
+
     private void enforceDestructionOfGarbageCollectedContainers() {
         ActiveContainerPhantomReference reference;
         while ((reference = (ActiveContainerPhantomReference) garbageCollectedContainers.poll()) != null) {