You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2015/03/25 15:37:02 UTC

[1/6] cassandra git commit: Allow overriding MAX_OUTSTANDING_REPLAY_COUNT

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.0 495ae9c7e -> 7c98030a7
  refs/heads/cassandra-2.1 86a380294 -> 768f83d25
  refs/heads/trunk c15ac661d -> ec9d0d1b7


Allow overriding MAX_OUTSTANDING_REPLAY_COUNT

Patch by Jerimiah Jordan, reviewed by brandonwilliams for CASSANDRA-7533


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7c98030a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7c98030a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7c98030a

Branch: refs/heads/cassandra-2.0
Commit: 7c98030a7d4551780377cfa6b3442868b62b4b20
Parents: 495ae9c
Author: Brandon Williams <br...@apache.org>
Authored: Wed Mar 25 09:32:57 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Mar 25 09:32:57 2015 -0500

----------------------------------------------------------------------
 CHANGES.txt                                                       | 1 +
 src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c98030a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index bcc59fc..fecc7e3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.0.14:
+ * Allow overriding MAX_OUTSTANDING_REPLAY_COUNT (CASSANDRA-7533)
  * Fix malformed JMX ObjectName containing IPv6 addresses (CASSANDRA-9027)
  * Fix potential data loss in CompressedSequentialWriter (CASSANDRA-8949)
  * (cqlsh) Allow increasing CSV field size limit through

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c98030a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
index 579b6ee..5687138 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
@@ -47,7 +47,7 @@ import org.cliffc.high_scale_lib.NonBlockingHashSet;
 public class CommitLogReplayer
 {
     private static final Logger logger = LoggerFactory.getLogger(CommitLogReplayer.class);
-    private static final int MAX_OUTSTANDING_REPLAY_COUNT = 1024;
+    private static final int MAX_OUTSTANDING_REPLAY_COUNT = Integer.getInteger("cassandra.commitlog_max_outstanding_replay_count", 1024);
 
     private final Set<Keyspace> keyspacesRecovered;
     private final List<Future<?>> futures;


[2/6] cassandra git commit: Allow overriding MAX_OUTSTANDING_REPLAY_COUNT

Posted by br...@apache.org.
Allow overriding MAX_OUTSTANDING_REPLAY_COUNT

Patch by Jerimiah Jordan, reviewed by brandonwilliams for CASSANDRA-7533


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7c98030a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7c98030a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7c98030a

Branch: refs/heads/cassandra-2.1
Commit: 7c98030a7d4551780377cfa6b3442868b62b4b20
Parents: 495ae9c
Author: Brandon Williams <br...@apache.org>
Authored: Wed Mar 25 09:32:57 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Mar 25 09:32:57 2015 -0500

----------------------------------------------------------------------
 CHANGES.txt                                                       | 1 +
 src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c98030a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index bcc59fc..fecc7e3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.0.14:
+ * Allow overriding MAX_OUTSTANDING_REPLAY_COUNT (CASSANDRA-7533)
  * Fix malformed JMX ObjectName containing IPv6 addresses (CASSANDRA-9027)
  * Fix potential data loss in CompressedSequentialWriter (CASSANDRA-8949)
  * (cqlsh) Allow increasing CSV field size limit through

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c98030a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
index 579b6ee..5687138 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
@@ -47,7 +47,7 @@ import org.cliffc.high_scale_lib.NonBlockingHashSet;
 public class CommitLogReplayer
 {
     private static final Logger logger = LoggerFactory.getLogger(CommitLogReplayer.class);
-    private static final int MAX_OUTSTANDING_REPLAY_COUNT = 1024;
+    private static final int MAX_OUTSTANDING_REPLAY_COUNT = Integer.getInteger("cassandra.commitlog_max_outstanding_replay_count", 1024);
 
     private final Set<Keyspace> keyspacesRecovered;
     private final List<Future<?>> futures;


[4/6] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/768f83d2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/768f83d2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/768f83d2

Branch: refs/heads/trunk
Commit: 768f83d2561372be8bbc9aeb42560c77c5c51999
Parents: 86a3802 7c98030
Author: Brandon Williams <br...@apache.org>
Authored: Wed Mar 25 09:36:40 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Mar 25 09:36:40 2015 -0500

----------------------------------------------------------------------
 CHANGES.txt                                                       | 1 +
 src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/768f83d2/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 02bd7b0,fecc7e3..f4d4008
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,63 -1,7 +1,64 @@@
 -2.0.14:
 +2.1.4
 + * Fix potential data loss in CompressedSequentialWriter (CASSANDRA-8949)
 + * Make PasswordAuthenticator number of hashing rounds configurable (CASSANDRA-8085)
 + * Fix AssertionError when binding nested collections in DELETE (CASSANDRA-8900)
 + * Check for overlap with non-early sstables in LCS (CASSANDRA-8739)
 + * Only calculate max purgable timestamp if we have to (CASSANDRA-8914)
 + * (cqlsh) Greatly improve performance of COPY FROM (CASSANDRA-8225)
 + * IndexSummary effectiveIndexInterval is now a guideline, not a rule (CASSANDRA-8993)
 + * Use correct bounds for page cache eviction of compressed files (CASSANDRA-8746)
 + * SSTableScanner enforces its bounds (CASSANDRA-8946)
 + * Cleanup cell equality (CASSANDRA-8947)
 + * Introduce intra-cluster message coalescing (CASSANDRA-8692)
 + * DatabaseDescriptor throws NPE when rpc_interface is used (CASSANDRA-8839)
 + * Don't check if an sstable is live for offline compactions (CASSANDRA-8841)
 + * Don't set clientMode in SSTableLoader (CASSANDRA-8238)
 + * Fix SSTableRewriter with disabled early open (CASSANDRA-8535)
 + * Allow invalidating permissions and cache time (CASSANDRA-8722)
 + * Log warning when queries that will require ALLOW FILTERING in Cassandra 3.0
 +   are executed (CASSANDRA-8418)
 + * Fix cassandra-stress so it respects the CL passed in user mode (CASSANDRA-8948)
 + * Fix rare NPE in ColumnDefinition#hasIndexOption() (CASSANDRA-8786)
 + * cassandra-stress reports per-operation statistics, plus misc (CASSANDRA-8769)
 + * Add SimpleDate (cql date) and Time (cql time) types (CASSANDRA-7523)
 + * Use long for key count in cfstats (CASSANDRA-8913)
 + * Make SSTableRewriter.abort() more robust to failure (CASSANDRA-8832)
 + * Remove cold_reads_to_omit from STCS (CASSANDRA-8860)
 + * Make EstimatedHistogram#percentile() use ceil instead of floor (CASSANDRA-8883)
 + * Fix top partitions reporting wrong cardinality (CASSANDRA-8834)
 + * Fix rare NPE in KeyCacheSerializer (CASSANDRA-8067)
 + * Pick sstables for validation as late as possible inc repairs (CASSANDRA-8366)
 + * Fix commitlog getPendingTasks to not increment (CASSANDRA-8856)
 + * Fix parallelism adjustment in range and secondary index queries
 +   when the first fetch does not satisfy the limit (CASSANDRA-8856)
 + * Check if the filtered sstables is non-empty in STCS (CASSANDRA-8843)
 + * Upgrade java-driver used for cassandra-stress (CASSANDRA-8842)
 + * Fix CommitLog.forceRecycleAllSegments() memory access error (CASSANDRA-8812)
 + * Improve assertions in Memory (CASSANDRA-8792)
 + * Fix SSTableRewriter cleanup (CASSANDRA-8802)
 + * Introduce SafeMemory for CompressionMetadata.Writer (CASSANDRA-8758)
 + * 'nodetool info' prints exception against older node (CASSANDRA-8796)
 + * Ensure SSTableReader.last corresponds exactly with the file end (CASSANDRA-8750)
 + * Make SSTableWriter.openEarly more robust and obvious (CASSANDRA-8747)
 + * Enforce SSTableReader.first/last (CASSANDRA-8744)
 + * Cleanup SegmentedFile API (CASSANDRA-8749)
 + * Avoid overlap with early compaction replacement (CASSANDRA-8683)
 + * Safer Resource Management++ (CASSANDRA-8707)
 + * Write partition size estimates into a system table (CASSANDRA-7688)
 + * cqlsh: Fix keys() and full() collection indexes in DESCRIBE output
 +   (CASSANDRA-8154)
 + * Show progress of streaming in nodetool netstats (CASSANDRA-8886)
 + * IndexSummaryBuilder utilises offheap memory, and shares data between
 +   each IndexSummary opened from it (CASSANDRA-8757)
 + * markCompacting only succeeds if the exact SSTableReader instances being 
 +   marked are in the live set (CASSANDRA-8689)
 + * cassandra-stress support for varint (CASSANDRA-8882)
 + * Fix Adler32 digest for compressed sstables (CASSANDRA-8778)
 + * Add nodetool statushandoff/statusbackup (CASSANDRA-8912)
 + * Use stdout for progress and stats in sstableloader (CASSANDRA-8982)
 +Merged from 2.0:
+  * Allow overriding MAX_OUTSTANDING_REPLAY_COUNT (CASSANDRA-7533)
   * Fix malformed JMX ObjectName containing IPv6 addresses (CASSANDRA-9027)
 - * Fix potential data loss in CompressedSequentialWriter (CASSANDRA-8949)
   * (cqlsh) Allow increasing CSV field size limit through
     cqlshrc config option (CASSANDRA-8934)
   * Stop logging range tombstones when exceeding the threshold

http://git-wip-us.apache.org/repos/asf/cassandra/blob/768f83d2/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
index e89338a,5687138..63afcbc
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
@@@ -46,8 -47,7 +46,8 @@@ import org.cliffc.high_scale_lib.NonBlo
  public class CommitLogReplayer
  {
      private static final Logger logger = LoggerFactory.getLogger(CommitLogReplayer.class);
-     private static final int MAX_OUTSTANDING_REPLAY_COUNT = 1024;
+     private static final int MAX_OUTSTANDING_REPLAY_COUNT = Integer.getInteger("cassandra.commitlog_max_outstanding_replay_count", 1024);
 +    private static final int LEGACY_END_OF_SEGMENT_MARKER = 0;
  
      private final Set<Keyspace> keyspacesRecovered;
      private final List<Future<?>> futures;


[5/6] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/768f83d2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/768f83d2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/768f83d2

Branch: refs/heads/cassandra-2.1
Commit: 768f83d2561372be8bbc9aeb42560c77c5c51999
Parents: 86a3802 7c98030
Author: Brandon Williams <br...@apache.org>
Authored: Wed Mar 25 09:36:40 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Mar 25 09:36:40 2015 -0500

----------------------------------------------------------------------
 CHANGES.txt                                                       | 1 +
 src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/768f83d2/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 02bd7b0,fecc7e3..f4d4008
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,63 -1,7 +1,64 @@@
 -2.0.14:
 +2.1.4
 + * Fix potential data loss in CompressedSequentialWriter (CASSANDRA-8949)
 + * Make PasswordAuthenticator number of hashing rounds configurable (CASSANDRA-8085)
 + * Fix AssertionError when binding nested collections in DELETE (CASSANDRA-8900)
 + * Check for overlap with non-early sstables in LCS (CASSANDRA-8739)
 + * Only calculate max purgable timestamp if we have to (CASSANDRA-8914)
 + * (cqlsh) Greatly improve performance of COPY FROM (CASSANDRA-8225)
 + * IndexSummary effectiveIndexInterval is now a guideline, not a rule (CASSANDRA-8993)
 + * Use correct bounds for page cache eviction of compressed files (CASSANDRA-8746)
 + * SSTableScanner enforces its bounds (CASSANDRA-8946)
 + * Cleanup cell equality (CASSANDRA-8947)
 + * Introduce intra-cluster message coalescing (CASSANDRA-8692)
 + * DatabaseDescriptor throws NPE when rpc_interface is used (CASSANDRA-8839)
 + * Don't check if an sstable is live for offline compactions (CASSANDRA-8841)
 + * Don't set clientMode in SSTableLoader (CASSANDRA-8238)
 + * Fix SSTableRewriter with disabled early open (CASSANDRA-8535)
 + * Allow invalidating permissions and cache time (CASSANDRA-8722)
 + * Log warning when queries that will require ALLOW FILTERING in Cassandra 3.0
 +   are executed (CASSANDRA-8418)
 + * Fix cassandra-stress so it respects the CL passed in user mode (CASSANDRA-8948)
 + * Fix rare NPE in ColumnDefinition#hasIndexOption() (CASSANDRA-8786)
 + * cassandra-stress reports per-operation statistics, plus misc (CASSANDRA-8769)
 + * Add SimpleDate (cql date) and Time (cql time) types (CASSANDRA-7523)
 + * Use long for key count in cfstats (CASSANDRA-8913)
 + * Make SSTableRewriter.abort() more robust to failure (CASSANDRA-8832)
 + * Remove cold_reads_to_omit from STCS (CASSANDRA-8860)
 + * Make EstimatedHistogram#percentile() use ceil instead of floor (CASSANDRA-8883)
 + * Fix top partitions reporting wrong cardinality (CASSANDRA-8834)
 + * Fix rare NPE in KeyCacheSerializer (CASSANDRA-8067)
 + * Pick sstables for validation as late as possible inc repairs (CASSANDRA-8366)
 + * Fix commitlog getPendingTasks to not increment (CASSANDRA-8856)
 + * Fix parallelism adjustment in range and secondary index queries
 +   when the first fetch does not satisfy the limit (CASSANDRA-8856)
 + * Check if the filtered sstables is non-empty in STCS (CASSANDRA-8843)
 + * Upgrade java-driver used for cassandra-stress (CASSANDRA-8842)
 + * Fix CommitLog.forceRecycleAllSegments() memory access error (CASSANDRA-8812)
 + * Improve assertions in Memory (CASSANDRA-8792)
 + * Fix SSTableRewriter cleanup (CASSANDRA-8802)
 + * Introduce SafeMemory for CompressionMetadata.Writer (CASSANDRA-8758)
 + * 'nodetool info' prints exception against older node (CASSANDRA-8796)
 + * Ensure SSTableReader.last corresponds exactly with the file end (CASSANDRA-8750)
 + * Make SSTableWriter.openEarly more robust and obvious (CASSANDRA-8747)
 + * Enforce SSTableReader.first/last (CASSANDRA-8744)
 + * Cleanup SegmentedFile API (CASSANDRA-8749)
 + * Avoid overlap with early compaction replacement (CASSANDRA-8683)
 + * Safer Resource Management++ (CASSANDRA-8707)
 + * Write partition size estimates into a system table (CASSANDRA-7688)
 + * cqlsh: Fix keys() and full() collection indexes in DESCRIBE output
 +   (CASSANDRA-8154)
 + * Show progress of streaming in nodetool netstats (CASSANDRA-8886)
 + * IndexSummaryBuilder utilises offheap memory, and shares data between
 +   each IndexSummary opened from it (CASSANDRA-8757)
 + * markCompacting only succeeds if the exact SSTableReader instances being 
 +   marked are in the live set (CASSANDRA-8689)
 + * cassandra-stress support for varint (CASSANDRA-8882)
 + * Fix Adler32 digest for compressed sstables (CASSANDRA-8778)
 + * Add nodetool statushandoff/statusbackup (CASSANDRA-8912)
 + * Use stdout for progress and stats in sstableloader (CASSANDRA-8982)
 +Merged from 2.0:
+  * Allow overriding MAX_OUTSTANDING_REPLAY_COUNT (CASSANDRA-7533)
   * Fix malformed JMX ObjectName containing IPv6 addresses (CASSANDRA-9027)
 - * Fix potential data loss in CompressedSequentialWriter (CASSANDRA-8949)
   * (cqlsh) Allow increasing CSV field size limit through
     cqlshrc config option (CASSANDRA-8934)
   * Stop logging range tombstones when exceeding the threshold

http://git-wip-us.apache.org/repos/asf/cassandra/blob/768f83d2/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
index e89338a,5687138..63afcbc
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
@@@ -46,8 -47,7 +46,8 @@@ import org.cliffc.high_scale_lib.NonBlo
  public class CommitLogReplayer
  {
      private static final Logger logger = LoggerFactory.getLogger(CommitLogReplayer.class);
-     private static final int MAX_OUTSTANDING_REPLAY_COUNT = 1024;
+     private static final int MAX_OUTSTANDING_REPLAY_COUNT = Integer.getInteger("cassandra.commitlog_max_outstanding_replay_count", 1024);
 +    private static final int LEGACY_END_OF_SEGMENT_MARKER = 0;
  
      private final Set<Keyspace> keyspacesRecovered;
      private final List<Future<?>> futures;


[6/6] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

Posted by br...@apache.org.
Merge branch 'cassandra-2.1' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ec9d0d1b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ec9d0d1b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ec9d0d1b

Branch: refs/heads/trunk
Commit: ec9d0d1b7e535a4d8dda2ef0601f3467c8a7e0fe
Parents: c15ac66 768f83d
Author: Brandon Williams <br...@apache.org>
Authored: Wed Mar 25 09:36:55 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Mar 25 09:36:55 2015 -0500

----------------------------------------------------------------------
 CHANGES.txt                                                       | 1 +
 src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ec9d0d1b/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ec9d0d1b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
----------------------------------------------------------------------


[3/6] cassandra git commit: Allow overriding MAX_OUTSTANDING_REPLAY_COUNT

Posted by br...@apache.org.
Allow overriding MAX_OUTSTANDING_REPLAY_COUNT

Patch by Jerimiah Jordan, reviewed by brandonwilliams for CASSANDRA-7533


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7c98030a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7c98030a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7c98030a

Branch: refs/heads/trunk
Commit: 7c98030a7d4551780377cfa6b3442868b62b4b20
Parents: 495ae9c
Author: Brandon Williams <br...@apache.org>
Authored: Wed Mar 25 09:32:57 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Mar 25 09:32:57 2015 -0500

----------------------------------------------------------------------
 CHANGES.txt                                                       | 1 +
 src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c98030a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index bcc59fc..fecc7e3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.0.14:
+ * Allow overriding MAX_OUTSTANDING_REPLAY_COUNT (CASSANDRA-7533)
  * Fix malformed JMX ObjectName containing IPv6 addresses (CASSANDRA-9027)
  * Fix potential data loss in CompressedSequentialWriter (CASSANDRA-8949)
  * (cqlsh) Allow increasing CSV field size limit through

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c98030a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
index 579b6ee..5687138 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
@@ -47,7 +47,7 @@ import org.cliffc.high_scale_lib.NonBlockingHashSet;
 public class CommitLogReplayer
 {
     private static final Logger logger = LoggerFactory.getLogger(CommitLogReplayer.class);
-    private static final int MAX_OUTSTANDING_REPLAY_COUNT = 1024;
+    private static final int MAX_OUTSTANDING_REPLAY_COUNT = Integer.getInteger("cassandra.commitlog_max_outstanding_replay_count", 1024);
 
     private final Set<Keyspace> keyspacesRecovered;
     private final List<Future<?>> futures;