diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/LocalCacheCleaner.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/LocalCacheCleaner.java index 7311919..f4ff3e5 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/LocalCacheCleaner.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/LocalCacheCleaner.java @@ -81,7 +81,8 @@ public void addResources(LocalResourcesTracker newTracker) { * @return stats about what was cleaned up during this call of cleanCache */ public LocalCacheCleanerStats cleanCache() { - LocalCacheCleanerStats stats = new LocalCacheCleanerStats(currentSize); + LocalCacheCleanerStats stats = + new LocalCacheCleanerStats(currentSize, targetSize); for (Iterator> i = resourceMap.entrySet().iterator(); currentSize - stats.totalDelSize > targetSize && i.hasNext();) { @@ -99,12 +100,14 @@ public LocalCacheCleanerStats cleanCache() { static class LocalCacheCleanerStats { private final Map userDelSizes = new TreeMap(); private final long cacheSizeBeforeClean; + private final long targetCacheSizeAfterClean; private long totalDelSize; private long publicDelSize; private long privateDelSize; - LocalCacheCleanerStats(long cacheSizeBeforeClean) { + LocalCacheCleanerStats(long cacheSizeBeforeClean, long targetSize) { this.cacheSizeBeforeClean = cacheSizeBeforeClean; + this.targetCacheSizeAfterClean = targetSize; } void incDelSize(String user, long delSize) { @@ -148,6 +151,8 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("Cache Size Before Clean: ").append(cacheSizeBeforeClean) .append(", "); + sb.append("Target Size After Clean: ").append(targetCacheSizeAfterClean) + .append(", "); sb.append("Total Deleted: ").append(totalDelSize).append(", "); sb.append("Public Deleted: ").append(publicDelSize).append(", "); sb.append("Private Deleted: ").append(privateDelSize);