Repository: hbase Updated Branches: refs/heads/branch-1.2 42c75d418 -> d2fe2a5a9
HBASE-19728 Add lock to filesCompacting in all place. Signed-off-by: Sean Busbey <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/14ad0719 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/14ad0719 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/14ad0719 Branch: refs/heads/branch-1.2 Commit: 14ad07199c514976ec3b9e9bd994f66a27d7a331 Parents: 42c75d4 Author: binlijin <[email protected]> Authored: Wed Jan 31 17:01:58 2018 +0800 Committer: Sean Busbey <[email protected]> Committed: Sat Feb 24 00:15:17 2018 -0600 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hbase/regionserver/HStore.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/14ad0719/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java index a19407a..d73afb9 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java @@ -1326,7 +1326,9 @@ public class HStore implements Store { this.lock.writeLock().lock(); try { this.storeEngine.getStoreFileManager().addCompactionResults(compactedFiles, result); - filesCompacting.removeAll(compactedFiles); // safe bc: lock.writeLock(); + synchronized (filesCompacting) { + filesCompacting.removeAll(compactedFiles); + } } finally { this.lock.writeLock().unlock(); } @@ -2364,7 +2366,11 @@ public class HStore implements Store { @Override public boolean needsCompaction() { - return this.storeEngine.needsCompaction(this.filesCompacting); + List<StoreFile> filesCompactingClone = null; + synchronized (filesCompacting) { + filesCompactingClone = Lists.newArrayList(filesCompacting); + } + return this.storeEngine.needsCompaction(filesCompactingClone); } @Override
