Reduce number of false positives

Increase grace period of stale containers as there is no guarantee when
they are collected. Trigger finalization in case objects with finalizer
are (indirectly) referring to ActiveContainer instances.

1 files changed, 2 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 69f33c833e1..2eb4cc0baa9 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
@@ -31,7 +31,7 @@ import static java.util.stream.Collectors.toList;
  */
 class ActiveContainerDeactivationWatchdog implements ActiveContainerMetrics, AutoCloseable {
     static final Duration WATCHDOG_FREQUENCY = Duration.ofMinutes(20);
-    static final Duration ACTIVE_CONTAINER_GRACE_PERIOD = Duration.ofHours(1);
+    static final Duration ACTIVE_CONTAINER_GRACE_PERIOD = Duration.ofHours(4);
     static final Duration GC_TRIGGER_FREQUENCY = ACTIVE_CONTAINER_GRACE_PERIOD.minusMinutes(5);
     static final Duration ENFORCE_DESTRUCTION_GCED_CONTAINERS_FREQUENCY = Duration.ofMinutes(5);
 
@@ -126,6 +126,7 @@ class ActiveContainerDeactivationWatchdog implements ActiveContainerMetrics, Aut
     private static void triggerGc() {
         log.log(Level.FINE, "Triggering GC");
         System.gc();
+        System.runFinalization();
     }
 
     private void enforceDestructionOfGarbageCollectedContainers() {