Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-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 E8F781165F for ; Thu, 22 May 2014 14:39:28 +0000 (UTC) Received: (qmail 68566 invoked by uid 500); 22 May 2014 14:16:33 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 68532 invoked by uid 500); 22 May 2014 14:16:32 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 68493 invoked by uid 99); 22 May 2014 14:16:31 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 May 2014 14:16:31 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 7600699DBF2; Thu, 22 May 2014 14:16:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brandonwilliams@apache.org To: commits@cassandra.apache.org Date: Thu, 22 May 2014 14:16:32 -0000 Message-Id: <93c11d0209c54bd781141e50eda45784@git.apache.org> In-Reply-To: <9af8649d851e417ca1f4f266756ff39e@git.apache.org> References: <9af8649d851e417ca1f4f266756ff39e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/4] git commit: Fix writing the checksum before closing the sstable. Fix writing the checksum before closing the sstable. Patch by Sankalp Kohli, reviewed by Benedict for CASSANDRA-7285 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9bd38878 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9bd38878 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9bd38878 Branch: refs/heads/trunk Commit: 9bd38878059932e83163c1354c7453e494cda3b1 Parents: 36cc02c Author: Brandon Williams Authored: Thu May 22 09:12:11 2014 -0500 Committer: Brandon Williams Committed: Thu May 22 09:12:11 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/io/sstable/SSTableWriter.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9bd38878/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java b/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java index f32bb96..9567f0e 100644 --- a/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java @@ -459,11 +459,12 @@ public class SSTableWriter extends SSTable private Pair close(long repairedAt) { - dataFile.writeFullChecksum(descriptor); + // index and filter iwriter.close(); // main data, close will truncate if necessary dataFile.close(); + dataFile.writeFullChecksum(descriptor); // write sstable statistics Map metadataComponents = sstableMetadataCollector.finalizeMetadata( partitioner.getClass().getCanonicalName(),