Merge branch 'cassandra-3.0' into cassandra-3.11

Jaumo · Feb 10, 2017 · b221e8e · b221e8e
2 parents baa59cd + 4e669cf
commit b221e8e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -16,6 +16,8 @@ Merged from 3.0:
    for a table that's in system_schema.tables (CASSANDRA-13180)
 Merged from 2.2:
   * Use only one file pointer when creating commitlog segments (CASSANDRA-12539)
+Merged from 2.1:
+ * Coalescing strategy can enter infinite loop (CASSANDRA-13159)
 
 3.10
  * Fix secondary index queries regression (CASSANDRA-13013)

diff --git a/src/java/org/apache/cassandra/utils/CoalescingStrategies.java b/src/java/org/apache/cassandra/utils/CoalescingStrategies.java
@@ -100,7 +100,7 @@ private static boolean maybeSleep(int messages, long averageGap, long maxCoalesc
     {
         // only sleep if we can expect to double the number of messages we're sending in the time interval
         long sleep = messages * averageGap;
-        if (sleep > maxCoalesceWindow)
+        if (sleep <= 0 || sleep > maxCoalesceWindow)
             return false;
 
         // assume we receive as many messages as we expect; apply the same logic to the future batch: