Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-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 E4659E54B for ; Mon, 11 Mar 2013 17:42:55 +0000 (UTC) Received: (qmail 95158 invoked by uid 500); 11 Mar 2013 17:42:55 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 95043 invoked by uid 500); 11 Mar 2013 17:42:53 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 94880 invoked by uid 99); 11 Mar 2013 17:42:53 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Mar 2013 17:42:53 +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; Mon, 11 Mar 2013 17:42:51 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E4A84238889B; Mon, 11 Mar 2013 17:42:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1455252 - /accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/tabletserver/InMemoryMap.java Date: Mon, 11 Mar 2013 17:42:30 -0000 To: commits@accumulo.apache.org From: kturner@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130311174230.E4A84238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kturner Date: Mon Mar 11 17:42:30 2013 New Revision: 1455252 URL: http://svn.apache.org/r1455252 Log: ACCUMULO-1170 fixed race condition Modified: accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/tabletserver/InMemoryMap.java Modified: accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/tabletserver/InMemoryMap.java URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/tabletserver/InMemoryMap.java?rev=1455252&r1=1455251&r2=1455252&view=diff ============================================================================== --- accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/tabletserver/InMemoryMap.java (original) +++ accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/tabletserver/InMemoryMap.java Mon Mar 11 17:42:30 2013 @@ -268,8 +268,6 @@ public class InMemoryMap { * */ public void mutate(List mutations) { - int mc = nextMutationCount.getAndAdd(mutations.size()); - int numKVs = 0; // Can not update mutationCount while writes that started before // are in progress, this would cause partial mutations to be seen. // Also, can not continue until mutation count is updated, because @@ -277,7 +275,8 @@ public class InMemoryMap { // wait for writes that started before to finish. // // using separate lock from this map, to allow read/write in parallel - synchronized (writeSerializer ) { + synchronized (writeSerializer) { + int mc = nextMutationCount.getAndAdd(mutations.size()); try { map.mutate(mutations, mc); } finally {