diff --git llap-server/src/java/org/apache/hadoop/hive/llap/cache/BuddyAllocator.java llap-server/src/java/org/apache/hadoop/hive/llap/cache/BuddyAllocator.java index f4a549c529..fcfc22a712 100644 --- llap-server/src/java/org/apache/hadoop/hive/llap/cache/BuddyAllocator.java +++ llap-server/src/java/org/apache/hadoop/hive/llap/cache/BuddyAllocator.java @@ -47,7 +47,7 @@ import org.apache.hadoop.hive.llap.metrics.LlapDaemonCacheMetrics; public final class BuddyAllocator - implements EvictionAwareAllocator, BuddyAllocatorMXBean, LlapOomDebugDump { + implements EvictionAwareAllocator, BuddyAllocatorMXBean, LlapIoDebugDump { private final Arena[] arenas; private final AtomicInteger allocatedArenas = new AtomicInteger(0); @@ -653,7 +653,6 @@ private void logOomErrorMessage(String msg) { */ @Override public void debugDumpShort(StringBuilder sb) { - memoryManager.debugDumpShort(sb); sb.append("\nDefrag counters: "); for (int i = 0; i < defragCounters.length; ++i) { sb.append(defragCounters[i].get()).append(", "); @@ -1558,12 +1557,6 @@ String testDump() { return sb.toString(); } - @Override - public String debugDumpForOom() { - return "\nALLOCATOR STATE:\n" + debugDumpForOomInternal() - + "\nPARENT STATE:\n" + memoryManager.debugDumpForOom(); - } - private String debugDumpForOomInternal() { StringBuilder sb = new StringBuilder(); for (Arena a : arenas) { diff --git llap-server/src/java/org/apache/hadoop/hive/llap/cache/CacheContentsTracker.java llap-server/src/java/org/apache/hadoop/hive/llap/cache/CacheContentsTracker.java index 6a361fa4fc..64c0125833 100644 --- llap-server/src/java/org/apache/hadoop/hive/llap/cache/CacheContentsTracker.java +++ llap-server/src/java/org/apache/hadoop/hive/llap/cache/CacheContentsTracker.java @@ -179,11 +179,6 @@ public void setEvictionListener(EvictionListener listener) { } @Override - public void setParentDebugDumper(LlapOomDebugDump dumper) { - realPolicy.setParentDebugDumper(dumper); - } - - @Override public long purge() { return realPolicy.purge(); } @@ -195,11 +190,6 @@ public long evictSomeBlocks(long memoryToReserve) { } @Override - public String debugDumpForOom() { - return realPolicy.debugDumpForOom(); - } - - @Override public void debugDumpShort(StringBuilder sb) { sb.append("\nCache state: "); for (TagState state : tagInfo.values()) { @@ -209,7 +199,6 @@ public void debugDumpShort(StringBuilder sb) { .append(state.maxSize); } } - realPolicy.debugDumpShort(sb); } @Override diff --git llap-server/src/java/org/apache/hadoop/hive/llap/cache/EvictionDispatcher.java llap-server/src/java/org/apache/hadoop/hive/llap/cache/EvictionDispatcher.java index 10a4bfbb58..6f5ac7f0d4 100644 --- llap-server/src/java/org/apache/hadoop/hive/llap/cache/EvictionDispatcher.java +++ llap-server/src/java/org/apache/hadoop/hive/llap/cache/EvictionDispatcher.java @@ -25,7 +25,7 @@ /** * Eviction dispatcher - uses double dispatch to route eviction notifications to correct caches. */ -public final class EvictionDispatcher implements EvictionListener, LlapOomDebugDump { +public final class EvictionDispatcher implements EvictionListener { private final LowLevelCache dataCache; private final SerDeLowLevelCacheImpl serdeCache; private final MetadataCache metadataCache; @@ -63,27 +63,4 @@ public void notifyEvicted(LlapMetadataBuffer buffer) { public void notifyEvicted(OrcFileEstimateErrors buffer) { metadataCache.notifyEvicted(buffer); } - - @Override - public String debugDumpForOom() { - StringBuilder sb = new StringBuilder(dataCache.debugDumpForOom()); - if (serdeCache != null) { - sb.append(serdeCache.debugDumpForOom()); - } - if (metadataCache != null) { - sb.append(metadataCache.debugDumpForOom()); - } - return sb.toString(); - } - - @Override - public void debugDumpShort(StringBuilder sb) { - dataCache.debugDumpShort(sb); - if (serdeCache != null) { - serdeCache.debugDumpShort(sb); - } - if (metadataCache != null) { - metadataCache.debugDumpShort(sb); - } - } } diff --git llap-server/src/java/org/apache/hadoop/hive/llap/cache/LlapOomDebugDump.java llap-server/src/java/org/apache/hadoop/hive/llap/cache/LlapIoDebugDump.java similarity index 93% rename from llap-server/src/java/org/apache/hadoop/hive/llap/cache/LlapOomDebugDump.java rename to llap-server/src/java/org/apache/hadoop/hive/llap/cache/LlapIoDebugDump.java index 29ddf5c112..105b354d07 100644 --- llap-server/src/java/org/apache/hadoop/hive/llap/cache/LlapOomDebugDump.java +++ llap-server/src/java/org/apache/hadoop/hive/llap/cache/LlapIoDebugDump.java @@ -18,7 +18,6 @@ package org.apache.hadoop.hive.llap.cache; -public interface LlapOomDebugDump { - String debugDumpForOom(); +public interface LlapIoDebugDump { void debugDumpShort(StringBuilder sb); } diff --git llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelCache.java llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelCache.java index af1b699771..9591e48ce0 100644 --- llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelCache.java +++ llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelCache.java @@ -24,7 +24,7 @@ import org.apache.hadoop.hive.common.io.DataCache.DiskRangeListFactory; import org.apache.hadoop.hive.common.io.encoded.MemoryBuffer; -public interface LowLevelCache extends LlapOomDebugDump { +public interface LowLevelCache { public enum Priority { NORMAL, HIGH diff --git llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelCacheImpl.java llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelCacheImpl.java index 5e102d93de..53bdc2a498 100644 --- llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelCacheImpl.java +++ llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelCacheImpl.java @@ -41,7 +41,7 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Function; -public class LowLevelCacheImpl implements LowLevelCache, BufferUsageManager, LlapOomDebugDump { +public class LowLevelCacheImpl implements LowLevelCache, BufferUsageManager, LlapIoDebugDump { private static final int DEFAULT_CLEANUP_INTERVAL = 600; private final Allocator allocator; private final AtomicInteger newEvictions = new AtomicInteger(0); @@ -448,32 +448,6 @@ public Allocator getAllocator() { } @Override - public String debugDumpForOom() { - StringBuilder sb = new StringBuilder("File cache state "); - for (Map.Entry>> e : - cache.entrySet()) { - if (!e.getValue().incRef()) continue; - try { - sb.append("\n file " + e.getKey()); - for (Map.Entry e2 : e.getValue().getCache().entrySet()) { - if (e2.getValue().incRef() < 0) continue; - try { - sb.append("\n [").append(e2.getKey()).append(", ") - .append(e2.getKey() + e2.getValue().declaredCachedLength) - .append(") => ").append(e2.getValue().toString()) - .append(" alloc ").append(e2.getValue().byteBuffer.position()); - } finally { - e2.getValue().decRef(); - } - } - } finally { - e.getValue().decRef(); - } - } - return sb.toString(); - } - - @Override public void debugDumpShort(StringBuilder sb) { sb.append("\nORC cache state "); int allLocked = 0, allUnlocked = 0, allEvicted = 0, allMoving = 0; diff --git llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelCacheMemoryManager.java llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelCacheMemoryManager.java index 31cd45f103..60d56d6511 100644 --- llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelCacheMemoryManager.java +++ llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelCacheMemoryManager.java @@ -130,18 +130,6 @@ public void releaseMemory(final long memoryToRelease) { } @Override - public String debugDumpForOom() { - if (evictor == null) return null; - return "\ncache state\n" + evictor.debugDumpForOom(); - } - - @Override - public void debugDumpShort(StringBuilder sb) { - if (evictor == null) return; - evictor.debugDumpShort(sb); - } - - @Override public void updateMaxSize(long maxSize) { this.maxSize = maxSize; } diff --git llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelCachePolicy.java llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelCachePolicy.java index 33236362b5..45829dd5c4 100644 --- llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelCachePolicy.java +++ llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelCachePolicy.java @@ -20,12 +20,11 @@ import org.apache.hadoop.hive.llap.cache.LowLevelCache.Priority; -public interface LowLevelCachePolicy extends LlapOomDebugDump { +public interface LowLevelCachePolicy extends LlapIoDebugDump { void cache(LlapCacheableBuffer buffer, Priority priority); void notifyLock(LlapCacheableBuffer buffer); void notifyUnlock(LlapCacheableBuffer buffer); long evictSomeBlocks(long memoryToReserve); void setEvictionListener(EvictionListener listener); - void setParentDebugDumper(LlapOomDebugDump dumper); long purge(); } diff --git llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelFifoCachePolicy.java llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelFifoCachePolicy.java index f7f80a8958..bdc6721f64 100644 --- llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelFifoCachePolicy.java +++ llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelFifoCachePolicy.java @@ -32,7 +32,6 @@ private final Lock lock = new ReentrantLock(); private final LinkedList buffers; private EvictionListener evictionListener; - private LlapOomDebugDump parentDebugDump; public LowLevelFifoCachePolicy() { LlapIoImpl.LOG.info("FIFO cache policy"); @@ -66,11 +65,6 @@ public void setEvictionListener(EvictionListener listener) { } @Override - public void setParentDebugDumper(LlapOomDebugDump dumper) { - this.parentDebugDump = dumper; - } - - @Override public long purge() { long evicted = evictSomeBlocks(Long.MAX_VALUE); LlapIoImpl.LOG.info("PURGE: evicted {} from FIFO policy", LlapUtil.humanReadableByteCount(evicted)); @@ -105,25 +99,6 @@ private long evictInternal(long memoryToReserve, int minSize) { } @Override - public String debugDumpForOom() { - StringBuilder sb = new StringBuilder("FIFO eviction list: "); - lock.lock(); - try { - sb.append(buffers.size()).append(" elements): "); - Iterator iter = buffers.iterator(); - while (iter.hasNext()) { - sb.append(iter.next().toStringForCache()).append(",\n"); - } - } finally { - lock.unlock(); - } - if (parentDebugDump != null) { - sb.append("\n").append(parentDebugDump.debugDumpForOom()); - } - return sb.toString(); - } - - @Override public void debugDumpShort(StringBuilder sb) { sb.append("\nFIFO eviction list: "); lock.lock(); @@ -132,8 +107,5 @@ public void debugDumpShort(StringBuilder sb) { } finally { lock.unlock(); } - if (parentDebugDump != null) { - parentDebugDump.debugDumpShort(sb); - } } } diff --git llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelLrfuCachePolicy.java llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelLrfuCachePolicy.java index 7787cb4867..82e19346bd 100644 --- llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelLrfuCachePolicy.java +++ llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelLrfuCachePolicy.java @@ -63,7 +63,6 @@ private final double expirePriority(long time, long lastAccess, double previous) /** Number of elements. */ private int heapSize = 0; private EvictionListener evictionListener; - private LlapOomDebugDump parentDebugDump; public LowLevelLrfuCachePolicy(int minBufferSize, long maxSize, Configuration conf) { lambda = HiveConf.getFloatVar(conf, HiveConf.ConfVars.LLAP_LRFU_LAMBDA); @@ -174,11 +173,6 @@ public void setEvictionListener(EvictionListener listener) { } @Override - public void setParentDebugDumper(LlapOomDebugDump dumper) { - this.parentDebugDump = dumper; - } - - @Override public long purge() { long evicted = evictSomeBlocks(Long.MAX_VALUE); LlapIoImpl.LOG.info("PURGE: evicted {} from LRFU policy", LlapUtil.humanReadableByteCount(evicted)); @@ -487,15 +481,6 @@ private static void dumpList(StringBuilder result, } @Override - public String debugDumpForOom() { - String result = debugDumpHeap(); - if (parentDebugDump != null) { - result += "\n" + parentDebugDump.debugDumpForOom(); - } - return result; - } - - @Override public void debugDumpShort(StringBuilder sb) { sb.append("\nLRFU eviction list: "); LlapCacheableBuffer listHeadLocal = listHead, listTailLocal = listTail; @@ -512,8 +497,5 @@ public void debugDumpShort(StringBuilder sb) { sb.append(c + " items"); } sb.append("\nLRFU eviction heap: " + heapSize + " items"); - if (parentDebugDump != null) { - parentDebugDump.debugDumpShort(sb); - } } } diff --git llap-server/src/java/org/apache/hadoop/hive/llap/cache/MemoryManager.java llap-server/src/java/org/apache/hadoop/hive/llap/cache/MemoryManager.java index 65b1d4f654..542041d133 100644 --- llap-server/src/java/org/apache/hadoop/hive/llap/cache/MemoryManager.java +++ llap-server/src/java/org/apache/hadoop/hive/llap/cache/MemoryManager.java @@ -18,7 +18,7 @@ package org.apache.hadoop.hive.llap.cache; -public interface MemoryManager extends LlapOomDebugDump { +public interface MemoryManager { void releaseMemory(long memUsage); void updateMaxSize(long maxSize); void reserveMemory(long memoryToReserve); diff --git llap-server/src/java/org/apache/hadoop/hive/llap/cache/SerDeLowLevelCacheImpl.java llap-server/src/java/org/apache/hadoop/hive/llap/cache/SerDeLowLevelCacheImpl.java index cb89d12e80..a8f89efdc8 100644 --- llap-server/src/java/org/apache/hadoop/hive/llap/cache/SerDeLowLevelCacheImpl.java +++ llap-server/src/java/org/apache/hadoop/hive/llap/cache/SerDeLowLevelCacheImpl.java @@ -43,7 +43,7 @@ import com.google.common.base.Function; -public class SerDeLowLevelCacheImpl implements BufferUsageManager, LlapOomDebugDump { +public class SerDeLowLevelCacheImpl implements BufferUsageManager, LlapIoDebugDump { private static final int DEFAULT_CLEANUP_INTERVAL = 600; private final Allocator allocator; private final AtomicInteger newEvictions = new AtomicInteger(0); @@ -722,24 +722,6 @@ public Allocator getAllocator() { } @Override - public String debugDumpForOom() { - StringBuilder sb = new StringBuilder("File cache state "); - for (Map.Entry> e : cache.entrySet()) { - if (!e.getValue().incRef()) continue; - try { - sb.append("\n file " + e.getKey()); - sb.append("\n ["); - e.getValue().getCache().toString(sb); - sb.append("]"); - } finally { - e.getValue().decRef(); - } - } - return sb.toString(); - } - - - @Override public void debugDumpShort(StringBuilder sb) { sb.append("\nSerDe cache state "); int allLocked = 0, allUnlocked = 0, allEvicted = 0, allMoving = 0; diff --git llap-server/src/java/org/apache/hadoop/hive/llap/cache/SimpleBufferManager.java llap-server/src/java/org/apache/hadoop/hive/llap/cache/SimpleBufferManager.java index a1b6caeb60..41855e171e 100644 --- llap-server/src/java/org/apache/hadoop/hive/llap/cache/SimpleBufferManager.java +++ llap-server/src/java/org/apache/hadoop/hive/llap/cache/SimpleBufferManager.java @@ -101,14 +101,4 @@ public DiskRangeList getFileData(Object fileKey, DiskRangeList range, long baseO public void notifyEvicted(MemoryBuffer buffer) { throw new UnsupportedOperationException("Buffer manager doesn't have cache"); } - - @Override - public String debugDumpForOom() { - return ""; - } - - @Override - public void debugDumpShort(StringBuilder sb) { - // TODO Auto-generated method stub - } } diff --git llap-server/src/java/org/apache/hadoop/hive/llap/io/api/impl/LlapIoImpl.java llap-server/src/java/org/apache/hadoop/hive/llap/io/api/impl/LlapIoImpl.java index 5003d9b5e5..e1e8a32aa6 100644 --- llap-server/src/java/org/apache/hadoop/hive/llap/io/api/impl/LlapIoImpl.java +++ llap-server/src/java/org/apache/hadoop/hive/llap/io/api/impl/LlapIoImpl.java @@ -46,7 +46,7 @@ import org.apache.hadoop.hive.llap.cache.CacheContentsTracker; import org.apache.hadoop.hive.llap.cache.EvictionDispatcher; import org.apache.hadoop.hive.llap.cache.LlapDataBuffer; -import org.apache.hadoop.hive.llap.cache.LlapOomDebugDump; +import org.apache.hadoop.hive.llap.cache.LlapIoDebugDump; import org.apache.hadoop.hive.llap.cache.LowLevelCache; import org.apache.hadoop.hive.llap.cache.LowLevelCacheImpl; import org.apache.hadoop.hive.llap.cache.LowLevelCacheMemoryManager; @@ -78,10 +78,13 @@ + + + import com.google.common.primitives.Ints; import com.google.common.util.concurrent.ThreadFactoryBuilder; -public class LlapIoImpl implements LlapIo { +public class LlapIoImpl implements LlapIo, LlapIoDebugDump { public static final Logger LOG = LoggerFactory.getLogger("LlapIoImpl"); public static final Logger ORC_LOGGER = LoggerFactory.getLogger("LlapIoOrc"); public static final Logger CACHE_LOGGER = LoggerFactory.getLogger("LlapIoCache"); @@ -95,12 +98,13 @@ private final LlapDaemonIOMetrics ioMetrics; private ObjectName buddyAllocatorMXBean; private final Allocator allocator; - private final LlapOomDebugDump memoryDump; private final FileMetadataCache fileMetadataCache; private final LowLevelCache dataCache; private final BufferUsageManager bufferManager; private final Configuration daemonConf; - private LowLevelCachePolicy cachePolicy; + private LowLevelCachePolicy cachePolicyWrapper; + + private List debugDumpComponents = new ArrayList<>(); private LlapIoImpl(Configuration conf) throws IOException { this.daemonConf = conf; @@ -140,51 +144,66 @@ private LlapIoImpl(Configuration conf) throws IOException { boolean useLrfu = HiveConf.getBoolVar(conf, HiveConf.ConfVars.LLAP_USE_LRFU); long totalMemorySize = HiveConf.getSizeVar(conf, ConfVars.LLAP_IO_MEMORY_MAX_SIZE); int minAllocSize = (int)HiveConf.getSizeVar(conf, ConfVars.LLAP_ALLOCATOR_MIN_ALLOC); - LowLevelCachePolicy cp = useLrfu ? new LowLevelLrfuCachePolicy( + LowLevelCachePolicy realCachePolicy = useLrfu ? new LowLevelLrfuCachePolicy( minAllocSize, totalMemorySize, conf) : new LowLevelFifoCachePolicy(); boolean trackUsage = HiveConf.getBoolVar(conf, HiveConf.ConfVars.LLAP_TRACK_CACHE_USAGE); if (trackUsage) { - this.cachePolicy = new CacheContentsTracker(cp); + this.cachePolicyWrapper = new CacheContentsTracker(realCachePolicy); } else { - this.cachePolicy = cp; + this.cachePolicyWrapper = realCachePolicy; } // Allocator uses memory manager to request memory, so create the manager next. LowLevelCacheMemoryManager memManager = new LowLevelCacheMemoryManager( - totalMemorySize, cachePolicy, cacheMetrics); + totalMemorySize, cachePolicyWrapper, cacheMetrics); cacheMetrics.setCacheCapacityTotal(totalMemorySize); // Cache uses allocator to allocate and deallocate, create allocator and then caches. BuddyAllocator allocator = new BuddyAllocator(conf, memManager, cacheMetrics); this.allocator = allocator; - this.memoryDump = allocator; LowLevelCacheImpl cacheImpl = new LowLevelCacheImpl( - cacheMetrics, cachePolicy, allocator, true); + cacheMetrics, cachePolicyWrapper, allocator, true); dataCache = cacheImpl; if (isEncodeEnabled) { SerDeLowLevelCacheImpl serdeCacheImpl = new SerDeLowLevelCacheImpl( - cacheMetrics, cachePolicy, allocator); + cacheMetrics, cachePolicyWrapper, allocator); serdeCache = serdeCacheImpl; } boolean useGapCache = HiveConf.getBoolVar(conf, ConfVars.LLAP_CACHE_ENABLE_ORC_GAP_CACHE); metadataCache = new MetadataCache( - allocator, memManager, cachePolicy, useGapCache, cacheMetrics); + allocator, memManager, cachePolicyWrapper, useGapCache, cacheMetrics); fileMetadataCache = metadataCache; // And finally cache policy uses cache to notify it of eviction. The cycle is complete! EvictionDispatcher e = new EvictionDispatcher( dataCache, serdeCache, metadataCache, allocator); - cachePolicy.setEvictionListener(e); - cachePolicy.setParentDebugDumper(e); + cachePolicyWrapper.setEvictionListener(e); cacheImpl.startThreads(); // Start the cache threads. bufferManager = bufferManagerOrc = cacheImpl; // Cache also serves as buffer manager. bufferManagerGeneric = serdeCache; + if (trackUsage) { + debugDumpComponents.add(cachePolicyWrapper); // Cache contents tracker. + } + debugDumpComponents.add(realCachePolicy); + debugDumpComponents.add(cacheImpl); + if (serdeCache != null) { + debugDumpComponents.add(serdeCache); + } + if (metadataCache != null) { + debugDumpComponents.add(metadataCache); + } + debugDumpComponents.add(allocator); } else { this.allocator = new SimpleAllocator(conf); - memoryDump = null; fileMetadataCache = null; SimpleBufferManager sbm = new SimpleBufferManager(allocator, cacheMetrics); bufferManager = bufferManagerOrc = bufferManagerGeneric = sbm; dataCache = sbm; + debugDumpComponents.add(new LlapIoDebugDump() { + @Override + public void debugDumpShort(StringBuilder sb) { + sb.append("LLAP IO allocator is not in use!"); + } + }); } // IO thread pool. Listening is used for unhandled errors for now (TODO: remove?) int numThreads = HiveConf.getIntVar(conf, HiveConf.ConfVars.LLAP_IO_THREADPOOL_SIZE); @@ -208,16 +227,15 @@ private void registerMXBeans() { @Override public String getMemoryInfo() { - if (memoryDump == null) return "\nNot using the allocator"; StringBuilder sb = new StringBuilder(); - memoryDump.debugDumpShort(sb); + debugDumpShort(sb); return sb.toString(); } @Override public long purge() { - if (cachePolicy != null) { - return cachePolicy.purge(); + if (cachePolicyWrapper != null) { + return cachePolicyWrapper.purge(); } return 0; } @@ -309,4 +327,11 @@ public MemoryBuffer create() { return new LlapDataBuffer(); } } + + @Override + public void debugDumpShort(StringBuilder sb) { + for (LlapIoDebugDump child : debugDumpComponents) { + child.debugDumpShort(sb); + } + } } diff --git llap-server/src/java/org/apache/hadoop/hive/llap/io/metadata/MetadataCache.java llap-server/src/java/org/apache/hadoop/hive/llap/io/metadata/MetadataCache.java index 0184e3053f..426d599b29 100644 --- llap-server/src/java/org/apache/hadoop/hive/llap/io/metadata/MetadataCache.java +++ llap-server/src/java/org/apache/hadoop/hive/llap/io/metadata/MetadataCache.java @@ -36,7 +36,7 @@ import org.apache.hadoop.hive.llap.cache.EvictionAwareAllocator; import org.apache.hadoop.hive.llap.cache.EvictionDispatcher; import org.apache.hadoop.hive.llap.cache.LlapAllocatorBuffer; -import org.apache.hadoop.hive.llap.cache.LlapOomDebugDump; +import org.apache.hadoop.hive.llap.cache.LlapIoDebugDump; import org.apache.hadoop.hive.llap.cache.LowLevelCachePolicy; import org.apache.hadoop.hive.llap.cache.MemoryManager; import org.apache.hadoop.hive.llap.cache.LowLevelCache.Priority; @@ -44,7 +44,7 @@ import org.apache.hadoop.hive.llap.metrics.LlapDaemonCacheMetrics; import org.apache.hadoop.hive.ql.io.orc.encoded.OrcBatchKey; -public class MetadataCache implements LlapOomDebugDump, FileMetadataCache { +public class MetadataCache implements LlapIoDebugDump, FileMetadataCache { private final ConcurrentHashMap metadata = new ConcurrentHashMap<>(); @@ -121,12 +121,6 @@ public void notifyEvicted(OrcFileEstimateErrors buffer) { estimateErrors.remove(buffer.getFileKey()); } - @Override - public String debugDumpForOom() { - StringBuilder sb = new StringBuilder(); - debugDumpShort(sb); - return sb.toString(); - } @Override public void debugDumpShort(StringBuilder sb) { diff --git llap-server/src/test/org/apache/hadoop/hive/llap/cache/TestBuddyAllocator.java llap-server/src/test/org/apache/hadoop/hive/llap/cache/TestBuddyAllocator.java index 714efef182..1e6f3ac96d 100644 --- llap-server/src/test/org/apache/hadoop/hive/llap/cache/TestBuddyAllocator.java +++ llap-server/src/test/org/apache/hadoop/hive/llap/cache/TestBuddyAllocator.java @@ -66,17 +66,8 @@ public void releaseMemory(long memUsage) { } @Override - public String debugDumpForOom() { - return ""; - } - - @Override public void updateMaxSize(long maxSize) { } - - @Override - public void debugDumpShort(StringBuilder sb) { - } } @Test diff --git llap-server/src/test/org/apache/hadoop/hive/llap/cache/TestLowLevelCacheImpl.java llap-server/src/test/org/apache/hadoop/hive/llap/cache/TestLowLevelCacheImpl.java index b19cdcf531..1c2eef2d5f 100644 --- llap-server/src/test/org/apache/hadoop/hive/llap/cache/TestLowLevelCacheImpl.java +++ llap-server/src/test/org/apache/hadoop/hive/llap/cache/TestLowLevelCacheImpl.java @@ -112,11 +112,7 @@ public long evictSomeBlocks(long memoryToReserve) { public void setEvictionListener(EvictionListener listener) { } - public String debugDumpForOom() { - return ""; - } - - public void setParentDebugDumper(LlapOomDebugDump dumper) { + public void setParentDebugDumper(LlapIoDebugDump dumper) { } @Override diff --git llap-server/src/test/org/apache/hadoop/hive/llap/cache/TestOrcMetadataCache.java llap-server/src/test/org/apache/hadoop/hive/llap/cache/TestOrcMetadataCache.java index 58c918c200..df20f20c8f 100644 --- llap-server/src/test/org/apache/hadoop/hive/llap/cache/TestOrcMetadataCache.java +++ llap-server/src/test/org/apache/hadoop/hive/llap/cache/TestOrcMetadataCache.java @@ -56,11 +56,7 @@ public long evictSomeBlocks(long memoryToReserve) { public void setEvictionListener(EvictionListener listener) { } - public String debugDumpForOom() { - return ""; - } - - public void setParentDebugDumper(LlapOomDebugDump dumper) { + public void setParentDebugDumper(LlapIoDebugDump dumper) { } @Override @@ -88,17 +84,8 @@ public void releaseMemory(long memUsage) { } @Override - public String debugDumpForOom() { - return ""; - } - - @Override public void updateMaxSize(long maxSize) { } - - @Override - public void debugDumpShort(StringBuilder sb) { - } } @Test