You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2014/02/05 02:17:35 UTC
[1/2] git commit: Make sure compaction throughput values doesn't
overflow because of int math patch by pvai reviewed by dbrosius for
cassandra-6647
Updated Branches:
refs/heads/cassandra-2.0 93bd89fbb -> 79b362616
Make sure compaction throughput values doesn't overflow because of int math
patch by pvai reviewed by dbrosius for cassandra-6647
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/511787d7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/511787d7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/511787d7
Branch: refs/heads/cassandra-2.0
Commit: 511787d75d19e778123bc0c1384c3fd80f1bf32e
Parents: ed5cac1
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Tue Feb 4 20:05:22 2014 -0500
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Tue Feb 4 20:05:22 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/compaction/CompactionManager.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/511787d7/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index b2e892e..75c7104 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,6 @@
1.2.15
* Move handling of migration event source to solve bootstrap race (CASSANDRA-6648)
+ * Make sure compaction throughput value doesn't overflow with int math (CASSANDRA-6647)
1.2.14
* Reverted code to limit CQL prepared statement cache by size (CASSANDRA-6592)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/511787d7/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index d26a072..471fd82 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@ -127,7 +127,7 @@ public class CompactionManager implements CompactionManagerMBean
*/
public RateLimiter getRateLimiter()
{
- double currentThroughput = DatabaseDescriptor.getCompactionThroughputMbPerSec() * 1024 * 1024;
+ double currentThroughput = DatabaseDescriptor.getCompactionThroughputMbPerSec() * 1024.0 * 1024.0;
// if throughput is set to 0, throttling is disabled
if (currentThroughput == 0 || StorageService.instance.isBootstrapMode())
currentThroughput = Double.MAX_VALUE;
[2/2] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by db...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/79b36261
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/79b36261
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/79b36261
Branch: refs/heads/cassandra-2.0
Commit: 79b3626160d91cd7c09001bf1c3a19600944349b
Parents: 93bd89f 511787d
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Tue Feb 4 20:16:56 2014 -0500
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Tue Feb 4 20:16:56 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 3 ++-
.../org/apache/cassandra/db/compaction/CompactionManager.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/79b36261/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index d3a78f7,75c7104..7e0a89e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,34 -1,17 +1,35 @@@
-1.2.15
- * Move handling of migration event source to solve bootstrap race (CASSANDRA-6648)
+2.0.6
+ * Fix direct Memory on architectures that do not support unaligned long access
+ (CASSANDRA-6628)
+ * Let scrub optionally skip broken counter partitions (CASSANDRA-5930)
+Merged from 1.2:
+ * Move handling of migration event source to solve bootstrap race. (CASSANDRA-6648)
-
+ * Make sure compaction throughput value doesn't overflow with int math (CASSANDRA-6647)
++
-1.2.14
- * Reverted code to limit CQL prepared statement cache by size (CASSANDRA-6592)
- * add cassandra.default_messaging_version property to allow easier
- upgrading from 1.1 (CASSANDRA-6619)
- * Allow executing CREATE statements multiple times (CASSANDRA-6471)
- * Don't send confusing info with timeouts (CASSANDRA-6491)
- * Don't resubmit counter mutation runnables internally (CASSANDRA-6427)
- * Don't drop local mutations without a hint (CASSANDRA-6510)
- * Don't allow null max_hint_window_in_ms (CASSANDRA-6419)
- * Validate SliceRange start and finish lengths (CASSANDRA-6521)
+2.0.5
+ * Reduce garbage generated by bloom filter lookups (CASSANDRA-6609)
+ * Add ks.cf names to tombstone logging (CASSANDRA-6597)
+ * Use LOCAL_QUORUM for LWT operations at LOCAL_SERIAL (CASSANDRA-6495)
+ * Wait for gossip to settle before accepting client connections (CASSANDRA-4288)
+ * Delete unfinished compaction incrementally (CASSANDRA-6086)
+ * Allow specifying custom secondary index options in CQL3 (CASSANDRA-6480)
+ * Improve replica pinning for cache efficiency in DES (CASSANDRA-6485)
+ * Fix LOCAL_SERIAL from thrift (CASSANDRA-6584)
+ * Don't special case received counts in CAS timeout exceptions (CASSANDRA-6595)
+ * Add support for 2.1 global counter shards (CASSANDRA-6505)
+ * Fix NPE when streaming connection is not yet established (CASSANDRA-6210)
+ * Avoid rare duplicate read repair triggering (CASSANDRA-6606)
+ * Fix paging discardFirst (CASSANDRA-6555)
+ * Fix ArrayIndexOutOfBoundsException in 2ndary index query (CASSANDRA-6470)
+ * Release sstables upon rebuilding 2i (CASSANDRA-6635)
+ * Add AbstractCompactionStrategy.startup() method (CASSANDRA-6637)
+ * SSTableScanner may skip rows during cleanup (CASSANDRA-6638)
+ * sstables from stalled repair sessions can resurrect deleted data (CASSANDRA-6503)
+ * Switch stress to use ITransportFactory (CASSANDRA-6641)
+ * Fix IllegalArgumentException during prepare (CASSANDRA-6592)
+ * Fix possible loss of 2ndary index entries during compaction (CASSANDRA-6517)
+Merged from 1.2:
* fsync compression metadata (CASSANDRA-6531)
* Validate CF existence on execution for prepared statement (CASSANDRA-6535)
* Add ability to throttle batchlog replay (CASSANDRA-6550)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/79b36261/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
----------------------------------------------------------------------