From ac00a60db2aa81c905875afbd6fea289d3532d18 Mon Sep 17 00:00:00 2001 From: Andrew Kyle Purtell Date: Tue, 18 Feb 2014 18:49:03 +0000 Subject: [PATCH] HBASE-10539. HRegion.addAndGetGlobalMemstoreSize returns previous size (Feng Honghua) git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1569471 13f79535-47bb-0310-9956-ffa450edef68 --- .../main/java/org/apache/hadoop/hbase/regionserver/HRegion.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java index 59dcf3ce0af..980db3c5f64 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java @@ -836,7 +836,7 @@ public class HRegion implements HeapSize { // , Writable{ if (this.rsAccounting != null) { rsAccounting.addAndGetGlobalMemstoreSize(memStoreSize); } - return this.memstoreSize.getAndAdd(memStoreSize); + return this.memstoreSize.addAndGet(memStoreSize); } /** @return a HRegionInfo object for this region */