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 D65E7181C2 for ; Fri, 7 Aug 2015 06:29:33 +0000 (UTC) Received: (qmail 21610 invoked by uid 500); 7 Aug 2015 06:29:33 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 21570 invoked by uid 500); 7 Aug 2015 06:29:33 -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 21549 invoked by uid 99); 7 Aug 2015 06:29:33 -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; Fri, 07 Aug 2015 06:29:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7F315DFA69; Fri, 7 Aug 2015 06:29:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: marcuse@apache.org To: commits@cassandra.apache.org Date: Fri, 07 Aug 2015 06:29:33 -0000 Message-Id: <5d1363cb204946c2a19faff22def170a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] cassandra git commit: Release the self ref when opening snapshot sstable readers Repository: cassandra Updated Branches: refs/heads/cassandra-2.2 ed4fad19e -> bf08e663b Release the self ref when opening snapshot sstable readers Patch by marcuse; reviewed by benedict for CASSANDRA-9998 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e9b975c2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e9b975c2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e9b975c2 Branch: refs/heads/cassandra-2.2 Commit: e9b975c279578fe2d6f25368fe2839e1d0572371 Parents: e1bb792 Author: Marcus Eriksson Authored: Thu Aug 6 15:22:50 2015 +0200 Committer: Marcus Eriksson Committed: Fri Aug 7 08:20:06 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9b975c2/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 9a475ea..75bdcde 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.1.9 + * Release snapshot selfRef when doing snapshot repair (CASSANDRA-9998) * Cannot replace token does not exist - DN node removed as Fat Client (CASSANDRA-9871) * Fix handling of enable/disable autocompaction (CASSANDRA-9899) * Commit log segment recycling is disabled by default (CASSANDRA-9896) http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9b975c2/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 ad66f8e..6777e7a 100644 --- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java @@ -2355,8 +2355,9 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean logger.debug("using snapshot sstable {}", entries.getKey()); // open without tracking hotness sstable = SSTableReader.open(entries.getKey(), entries.getValue(), metadata, partitioner, true, false); - // This is technically not necessary since it's a snapshot but makes things easier refs.tryRef(sstable); + // release the self ref as we never add the snapshot sstable to DataTracker where it is otherwise released + sstable.selfRef().release(); } else if (logger.isDebugEnabled()) {