Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0527810C47 for ; Fri, 2 Aug 2013 22:07:25 +0000 (UTC) Received: (qmail 98647 invoked by uid 500); 2 Aug 2013 22:07:24 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 98620 invoked by uid 500); 2 Aug 2013 22:07:24 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 98613 invoked by uid 99); 2 Aug 2013 22:07:24 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Aug 2013 22:07:24 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Aug 2013 22:07:23 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id BA66123888E2; Fri, 2 Aug 2013 22:07:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1509886 - /hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java Date: Fri, 02 Aug 2013 22:07:03 -0000 To: commits@hbase.apache.org From: eclark@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130802220703.BA66123888E2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: eclark Date: Fri Aug 2 22:07:03 2013 New Revision: 1509886 URL: http://svn.apache.org/r1509886 Log: HBASE-9087 Handlers being blocked during reads Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java?rev=1509886&r1=1509885&r2=1509886&view=diff ============================================================================== --- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java (original) +++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java Fri Aug 2 22:07:03 2013 @@ -27,10 +27,11 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; import java.util.NavigableSet; +import java.util.Set; import java.util.SortedSet; import java.util.concurrent.Callable; import java.util.concurrent.CompletionService; -import java.util.concurrent.CopyOnWriteArraySet; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorCompletionService; import java.util.concurrent.Future; @@ -145,8 +146,8 @@ public class HStore implements Store { final List filesCompacting = Lists.newArrayList(); // All access must be synchronized. - private final CopyOnWriteArraySet changedReaderObservers = - new CopyOnWriteArraySet(); + private final Set changedReaderObservers = + Collections.newSetFromMap(new ConcurrentHashMap()); private final int blocksize; private HFileDataBlockEncoder dataBlockEncoder;