commit 6c34d6db0f22413ca2c1060f3c539c095d1252db
author nharmata <nharmata@google.com> Mon Jul 22 11:12:44 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Jul 22 11:28:22 2019 -0700
tree 173dcbbdc266824f090bfb6b042c6e67be05ad44
parent ff031dbcc2ff9a553a9ff50e365549c7c6cfcada

Clarify that the numbers refer to the usage & size of the tenured space, not that of the entire heap.

RELNOTES: None
PiperOrigin-RevId: 259366068

src/main/java/com/google/devtools/build/lib/runtime/RetainedHeapLimiter.java

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/RetainedHeapLimiter.java b/src/main/java/com/google/devtools/build/lib/runtime/RetainedHeapLimiter.java
index 8176be6..98e3248 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/RetainedHeapLimiter.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/RetainedHeapLimiter.java
@@ -143,9 +143,10 @@
             // Assume we got here from a GC initiated by the other branch.
             String exitMsg =
                 String.format(
-                    "RetainedHeapLimiter forcing exit due to GC thrashing: tenured space "
-                        + "%s out of %s (>%s%%) occupied after back-to-back full GCs",
-                    space.getUsed(), space.getMax(), occupiedHeapPercentageThreshold.getAsInt());
+                    "RetainedHeapLimiter forcing exit due to GC thrashing: After back-to-back full "
+                        + "GCs, the tenured space is more than %s%% occupied (%s out of a tenured "
+                        + "space size of %s)",
+                    occupiedHeapPercentageThreshold.getAsInt(), space.getUsed(), space.getMax());
             System.err.println(exitMsg);
             logger.atInfo().log(exitMsg);
             // Exits the runtime.
@@ -153,7 +154,8 @@
           } else if (System.currentTimeMillis() - lastTriggeredGcInMilliseconds.get()
               > MIN_TIME_BETWEEN_TRIGGERED_GC_MILLISECONDS) {
             logger.atInfo().log(
-                "Triggering a full GC with %s out of %s used", space.getUsed(), space.getMax());
+                "Triggering a full GC with %s tenured space used out of a tenured space size of %s",
+                space.getUsed(), space.getMax());
             // Force a full stop-the-world GC and see if it can get us below the threshold.
             System.gc();
             lastTriggeredGcInMilliseconds.set(System.currentTimeMillis());