Repository: hbase Updated Branches: refs/heads/branch-1.4 475e38bee -> 8b0a7dd76
HBASE-19728 Add lock to filesCompacting in all place. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/8b0a7dd7 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8b0a7dd7 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8b0a7dd7 Branch: refs/heads/branch-1.4 Commit: 8b0a7dd76de1eafd74395119eda0ed2665156e1e Parents: 475e38b Author: binlijin <[email protected]> Authored: Wed Jan 31 17:01:58 2018 +0800 Committer: Andrew Purtell <[email protected]> Committed: Thu Feb 1 16:41:48 2018 -0800 ---------------------------------------------------------------------- .../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/8b0a7dd7/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 1e69dbf..730deea 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 @@ -1447,7 +1447,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(); } @@ -2560,7 +2562,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
