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 A839110FB5 for ; Mon, 9 Feb 2015 21:47:21 +0000 (UTC) Received: (qmail 8797 invoked by uid 500); 9 Feb 2015 21:47:21 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 8677 invoked by uid 500); 9 Feb 2015 21:47:21 -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 8505 invoked by uid 99); 9 Feb 2015 21:47:21 -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; Mon, 09 Feb 2015 21:47:21 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 45135E0159; Mon, 9 Feb 2015 21:47:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aleksey@apache.org To: commits@cassandra.apache.org Date: Mon, 09 Feb 2015 21:47:22 -0000 Message-Id: <0bb93bc7b2df4ff7a85c109382550a2e@git.apache.org> In-Reply-To: <42533bd6d3fd4ea585456f2950daa71d@git.apache.org> References: <42533bd6d3fd4ea585456f2950daa71d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] cassandra git commit: Disable CASSANDRA-7688 until DT is fixed Disable CASSANDRA-7688 until DT is fixed Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fd6f9c6f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fd6f9c6f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fd6f9c6f Branch: refs/heads/trunk Commit: fd6f9c6f9c15ab28d0db0edef1f84faaa7ea42c5 Parents: c1a2e0f Author: Aleksey Yeschenko Authored: Tue Feb 10 00:46:29 2015 +0300 Committer: Aleksey Yeschenko Committed: Tue Feb 10 00:46:29 2015 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 - src/java/org/apache/cassandra/service/CassandraDaemon.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fd6f9c6f/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 5b23d87..d44d70d 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,5 +1,4 @@ 2.1.3 - * Write partition size estimates into a system table (CASSANDRA-7688) * Upgrade libthrift to 0.9.2 (CASSANDRA-8685) * Don't use the shared ref in sstableloader (CASSANDRA-8704) * Purge internal prepared statements if related tables or http://git-wip-us.apache.org/repos/asf/cassandra/blob/fd6f9c6f/src/java/org/apache/cassandra/service/CassandraDaemon.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java index 1198b3e..50c8295 100644 --- a/src/java/org/apache/cassandra/service/CassandraDaemon.java +++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java @@ -366,7 +366,7 @@ public class CassandraDaemon waitForGossipToSettle(); // schedule periodic dumps of table size estimates into SystemKeyspace.SIZE_ESTIMATES_CF - ScheduledExecutors.optionalTasks.scheduleWithFixedDelay(SizeEstimatesRecorder.instance, 30, 5 * 60, TimeUnit.SECONDS); + // ScheduledExecutors.optionalTasks.scheduleWithFixedDelay(SizeEstimatesRecorder.instance, 30, 5 * 60, TimeUnit.SECONDS); // Thrift InetAddress rpcAddr = DatabaseDescriptor.getRpcAddress();