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 20E664F9A for ; Sat, 9 Jul 2011 16:12:41 +0000 (UTC) Received: (qmail 74806 invoked by uid 500); 9 Jul 2011 16:12:41 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 74739 invoked by uid 500); 9 Jul 2011 16:12:40 -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 74725 invoked by uid 99); 9 Jul 2011 16:12:39 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 09 Jul 2011 16:12:39 +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; Sat, 09 Jul 2011 16:12:35 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 93C0F23888C2 for ; Sat, 9 Jul 2011 16:12:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1144692 - /cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/CompactionController.java Date: Sat, 09 Jul 2011 16:12:15 -0000 To: commits@cassandra.apache.org From: jbellis@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110709161215.93C0F23888C2@eris.apache.org> Author: jbellis Date: Sat Jul 9 16:12:15 2011 New Revision: 1144692 URL: http://svn.apache.org/viewvc?rev=1144692&view=rev Log: handle zero rowSize in throttleResolution calculation Modified: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/CompactionController.java Modified: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/CompactionController.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/CompactionController.java?rev=1144692&r1=1144691&r2=1144692&view=diff ============================================================================== --- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/CompactionController.java (original) +++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/CompactionController.java Sat Jul 9 16:12:15 2011 @@ -57,7 +57,11 @@ public class CompactionController this.forceDeserialize = forceDeserialize; isMajor = cfs.isCompleteSSTables(this.sstables); // how many rows we expect to compact in 100ms - throttleResolution = (int) (DatabaseDescriptor.getCompactionThroughputMbPerSec() * 1024 * 1024 / (10 * cfs.getMeanRowSize())); + long rowSize = cfs.getMeanRowSize(); + int rowsPerSecond = rowSize > 0 + ? (int) (DatabaseDescriptor.getCompactionThroughputMbPerSec() * 1024 * 1024 / rowSize) + : 1000; + throttleResolution = rowsPerSecond / 10; if (throttleResolution <= 0) throttleResolution = 1; }