Return-Path: <commits-return-171171-archive-asf-public=cust-asf.ponee.io@cassandra.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id 1D850200B13
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Tue, 31 May 2016 10:45:24 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id 1C314160A39; Tue, 31 May 2016 08:45:24 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 61839160A3D
	for <archive-asf-public@cust-asf.ponee.io>; Tue, 31 May 2016 10:45:23 +0200 (CEST)
Received: (qmail 20317 invoked by uid 500); 31 May 2016 08:45:22 -0000
Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cassandra.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cassandra.apache.org>
List-Post: <mailto:commits@cassandra.apache.org>
List-Id: <commits.cassandra.apache.org>
Reply-To: dev@cassandra.apache.org
Delivered-To: mailing list commits@cassandra.apache.org
Received: (qmail 20078 invoked by uid 99); 31 May 2016 08:45:22 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 31 May 2016 08:45:22 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id CAD4FE385C; Tue, 31 May 2016 08:45:21 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: samt@apache.org
To: commits@cassandra.apache.org
Date: Tue, 31 May 2016 08:45:24 -0000
Message-Id: <9006e76d80ac4aedb03751abd2a3f868@git.apache.org>
In-Reply-To: <983600f009d84fd49e91ca5d4a1c7ea6@git.apache.org>
References: <983600f009d84fd49e91ca5d4a1c7ea6@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [04/13] cassandra git commit: Fix index build regression from 9669.
archived-at: Tue, 31 May 2016 08:45:24 -0000

Fix index build regression from 9669.

Patch by Branimir Lambov; reviewed by Sam Tunnicliffe for CASSANDRA-9669


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/66c8f2b7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/66c8f2b7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/66c8f2b7

Branch: refs/heads/cassandra-3.7
Commit: 66c8f2b7f79fe794cc1e0594d9add260c209a9a2
Parents: 6add3c9
Author: Branimir Lambov <branimir.lambov@datastax.com>
Authored: Thu May 26 12:44:16 2016 +0300
Committer: Sam Tunnicliffe <sam@beobal.com>
Committed: Tue May 31 09:22:09 2016 +0100

----------------------------------------------------------------------
 .../org/apache/cassandra/db/ColumnFamilyStore.java     | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/66c8f2b7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 45486c1..d86f941 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -937,11 +937,14 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
      */
     public ListenableFuture<ReplayPosition> forceFlush()
     {
-        Memtable current = data.getView().getCurrentMemtable();
-        for (ColumnFamilyStore cfs : concatWithIndexes())
-            if (!cfs.data.getView().getCurrentMemtable().isClean())
-                return switchMemtableIfCurrent(current);
-        return waitForFlushes();
+        synchronized (data)
+        {
+            Memtable current = data.getView().getCurrentMemtable();
+            for (ColumnFamilyStore cfs : concatWithIndexes())
+                if (!cfs.data.getView().getCurrentMemtable().isClean())
+                    return switchMemtableIfCurrent(current);
+            return waitForFlushes();
+        }
     }
 
     /**