From 3623089cbad92a898a3230cb369ed6468046abb1 Mon Sep 17 00:00:00 2001 From: Vasudevan Date: Tue, 13 Feb 2018 15:49:37 +0530 Subject: [PATCH] HBASE-19977 FileMmapEngine allocation of byte buffers should be synchronized (Ram) --- .../hadoop/hbase/io/hfile/bucket/FileMmapEngine.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/FileMmapEngine.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/FileMmapEngine.java index e2f019114b6..82f42cda2ac 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/FileMmapEngine.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/FileMmapEngine.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.io.RandomAccessFile; import java.nio.ByteBuffer; import java.nio.channels.FileChannel; +import java.util.concurrent.atomic.AtomicInteger; import org.apache.yetus.audience.InterfaceAudience; import org.slf4j.Logger; @@ -69,12 +70,11 @@ public class FileMmapEngine implements IOEngine { throw ioex; } ByteBufferAllocator allocator = new ByteBufferAllocator() { - int pos = 0; + AtomicInteger pos = new AtomicInteger(0); @Override public ByteBuffer allocate(long size) throws IOException { ByteBuffer buffer = fileChannel.map(java.nio.channels.FileChannel.MapMode.READ_WRITE, - pos * size, size); - pos++; + pos.getAndIncrement() * size, size); return buffer; } }; @@ -106,7 +106,7 @@ public class FileMmapEngine implements IOEngine { byte[] dst = new byte[length]; bufferArray.getMultiple(offset, length, dst); return deserializer.deserialize(new SingleByteBuff(ByteBuffer.wrap(dst)), true, - MemoryType.EXCLUSIVE); + MemoryType.EXCLUSIVE); } /**